# HG changeset patch # User Chris Cannam # Date 1479228842 0 # Node ID abfc498c52bc42678722a70ec57cc30ddb6c8a34 # Parent c4f873749ab51fa5f43bea9d13dafc19b369cc19 Test fixes diff -r c4f873749ab5 -r abfc498c52bc base/test/TestOurRealTime.h --- a/base/test/TestOurRealTime.h Tue Nov 15 16:12:48 2016 +0000 +++ b/base/test/TestOurRealTime.h Tue Nov 15 16:54:02 2016 +0000 @@ -324,24 +324,17 @@ for (int j = 0; j < m; ++j) { int rate = rates[j]; - cerr << "frame = " << frame << ", rate = " << rate << endl; - RealTime rt = RealTime::frame2RealTime(frame, rate); QCOMPARE(rt.sec, realTimes[j][i].sec); QCOMPARE(rt.nsec, realTimes[j][i].nsec); - cerr << "rt = " << rt << endl; - cerr << "rate = " << rate << endl; - frame_type conv = RealTime::realTime2Frame(rt, rate); - cerr << "conv = " << conv << endl; rt = RealTime::frame2RealTime(-frame, rate); frame_type negconv = RealTime::realTime2Frame(rt, rate); - cerr << "negconv = " << negconv << endl; if (rate > ONE_BILLION) { - // We no longer have enough precision in RealTime + // We don't have enough precision in RealTime // for this absurd sample rate, so a round trip // conversion may round QVERIFY(abs(frame - conv) < 2); diff -r c4f873749ab5 -r abfc498c52bc base/test/TestVampRealTime.h --- a/base/test/TestVampRealTime.h Tue Nov 15 16:12:48 2016 +0000 +++ b/base/test/TestVampRealTime.h Tue Nov 15 16:54:02 2016 +0000 @@ -298,24 +298,17 @@ for (int j = 0; j < m; ++j) { int rate = rates[j]; - cerr << "frame = " << frame << ", rate = " << rate << endl; - RealTime rt = RealTime::frame2RealTime(frame, rate); QCOMPARE(rt.sec, realTimes[j][i].sec); QCOMPARE(rt.nsec, realTimes[j][i].nsec); - cerr << "rt = " << rt << endl; - cerr << "rate = " << rate << endl; - frame_type conv = RealTime::realTime2Frame(rt, rate); - cerr << "conv = " << conv << endl; rt = RealTime::frame2RealTime(-frame, rate); frame_type negconv = RealTime::realTime2Frame(rt, rate); - cerr << "negconv = " << negconv << endl; if (rate > ONE_BILLION) { - // We no longer have enough precision in RealTime + // We don't have enough precision in RealTime // for this absurd sample rate, so a round trip // conversion may round QVERIFY(abs(frame - conv) < 2); diff -r c4f873749ab5 -r abfc498c52bc data/fileio/test/AudioFileReaderTest.h --- a/data/fileio/test/AudioFileReaderTest.h Tue Nov 15 16:12:48 2016 +0000 +++ b/data/fileio/test/AudioFileReaderTest.h Tue Nov 15 16:54:02 2016 +0000 @@ -31,7 +31,7 @@ using namespace std; -static QString audioDir = "testfiles"; +static QString audioDir = "svcore/data/fileio/test/testfiles"; class AudioFileReaderTest : public QObject {