diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
| commit | 8aeb741ccbe2edb528e98a431bf55459a6836a9b (patch) | |
| tree | a14569b531d9867683a1ac1c94c8e0eb406906a8 /test | |
| parent | 4ba8772aef261da209bbb882325fd61a8b479fd7 (diff) | |
| parent | 22f2cd94132f93a159c2ce9fe263771cb5a5dbdf (diff) | |
Merge master.
Diffstat (limited to 'test')
| -rw-r--r-- | test/resampler_test.cc | 5 | ||||
| -rw-r--r-- | test/wscript | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/resampler_test.cc b/test/resampler_test.cc index 5bee3603b..3be251b3a 100644 --- a/test/resampler_test.cc +++ b/test/resampler_test.cc @@ -33,10 +33,9 @@ resampler_test_one (int from, int to) int total_out = 0; /* 3 hours */ - int64_t const N = from * 60 * 60 * 3; - + int64_t const N = int64_t (from) * 60 * 60 * 3; + /* XXX: no longer checks anything */ - for (int64_t i = 0; i < N; i += 1000) { shared_ptr<AudioBuffers> a (new AudioBuffers (1, 1000)); a->make_silent (); diff --git a/test/wscript b/test/wscript index 24daa7762..ec8dfd42c 100644 --- a/test/wscript +++ b/test/wscript @@ -12,7 +12,7 @@ def configure(conf): def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' - obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' + obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' obj.use = 'libdcpomatic' obj.source = """ 4k_test.cc |