Fix up libardour tests.

git-svn-id: svn://localhost/ardour2/branches/3.0@7484 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/run-tests.sh b/libs/ardour/run-tests.sh
index 91ac3e2ee707432ba5e1d0f5c681779d45994566..dc3564c483dfbc15c34acb0929ccff0c70efe078 100755 (executable)
--- a/libs/ardour/run-tests.sh
+++ b/libs/ardour/run-tests.sh
@@ -12,8 +12,6 @@ libs='libs'
 
 export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH
 
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-
 if [ "$1" == "--debug" ]
 then
         gdb ./libs/ardour/run-tests

diff --git a/libs/ardour/test/bbt_test.cpp b/libs/ardour/test/bbt_test.cpp
index ae169cc43ed526b9839abf60bafd0e545da82e7b..13bf5d48ebed58e91282affde05a43a11a321ec3 100644 (file)
--- a/libs/ardour/test/bbt_test.cpp
+++ b/libs/ardour/test/bbt_test.cpp
@@ -18,15 +18,15 @@ BBTTest::addTest ()
 
        // Test basic operations with a flat tempo map
        BBT_Time time = map.bbt_add(BBT_Time(1, 1, 0), BBT_Time(1, 2, 3));
-       //cerr << "result: BBT_Time(" << time.bars << ", " << time.beats << ", " 
+       //cout << "result: BBT_Time(" << time.bars << ", " << time.beats << ", " 
        //     << time.ticks << ")" << endl;
-       CPPUNIT_ASSERT(time == BBT_Time(2, 3, 0));
+       CPPUNIT_ASSERT(time == BBT_Time(2, 3, 3));
 
 
        time = map.bbt_add(BBT_Time(1, 2, 3), BBT_Time(2, 2, 3));
        //cerr << "result: BBT_Time(" << time.bars << ", " << time.beats << ", " 
        //     << time.ticks << ")" << endl;
-       CPPUNIT_ASSERT(time == BBT_Time(3, 4, 3));
+       CPPUNIT_ASSERT(time == BBT_Time(3, 4, 6));
 }
 
 void

diff --git a/libs/ardour/test/interpolation_test.cpp b/libs/ardour/test/interpolation_test.cpp
index 107d373101ce380bfb361aea5618298402202ac5..ef47417c6ea6ddeca5ce78d5bf4f3810fa38ecc5 100644 (file)
--- a/libs/ardour/test/interpolation_test.cpp
+++ b/libs/ardour/test/interpolation_test.cpp
@@ -10,9 +10,9 @@ void
 InterpolationTest::linearInterpolationTest ()
 {
        nframes_t result = 0;
-       cout << "\nLinear Interpolation Test\n";
+//     cout << "\nLinear Interpolation Test\n";
 
-       cout << "\nSpeed: 1/3";
+//     cout << "\nSpeed: 1/3";
        for (int i = 0; 3*i < NUM_SAMPLES - 1024;) {
                linear.set_speed (double(1.0)/double(3.0));
                linear.set_target_speed (double(1.0)/double(3.0));
@@ -20,7 +20,7 @@ InterpolationTest::linearInterpolationTest ()
                i += result;
        }
 
-       cout << "\nSpeed: 1.0";
+//     cout << "\nSpeed: 1.0";
        linear.reset();
        linear.set_speed (1.0);
        linear.set_target_speed (linear.speed());
@@ -30,7 +30,7 @@ InterpolationTest::linearInterpolationTest ()
                CPPUNIT_ASSERT_EQUAL (1.0f, output[i]);
        }
 
-       cout << "\nSpeed: 0.5";
+//     cout << "\nSpeed: 0.5";
        linear.reset();
        linear.set_speed (0.5);
        linear.set_target_speed (linear.speed());
@@ -40,14 +40,14 @@ InterpolationTest::linearInterpolationTest ()
                CPPUNIT_ASSERT_EQUAL (1.0f, output[i]);
        }
 
-       cout << "\nSpeed: 0.2";
+//     cout << "\nSpeed: 0.2";
        linear.reset();
        linear.set_speed (0.2);
        linear.set_target_speed (linear.speed());
        result = linear.interpolate (0, NUM_SAMPLES, input, output);
        CPPUNIT_ASSERT_EQUAL ((uint32_t)(NUM_SAMPLES * linear.speed()), result);
 
-       cout << "\nSpeed: 0.02";
+//     cout << "\nSpeed: 0.02";
        linear.reset();
        linear.set_speed (0.02);
        linear.set_target_speed (linear.speed());
@@ -64,7 +64,7 @@ InterpolationTest::linearInterpolationTest ()
           CPPUNIT_ASSERT_EQUAL ((nframes_t)(NUM_SAMPLES * linear.speed()), result);
           */
 
-       cout << "\nSpeed: 2.0";
+//     cout << "\nSpeed: 2.0";
        linear.reset();
        linear.set_speed (2.0);
        linear.set_target_speed (linear.speed());
@@ -74,7 +74,7 @@ InterpolationTest::linearInterpolationTest ()
                CPPUNIT_ASSERT_EQUAL (1.0f, output[i]);
        }
 
-       cout << "\nSpeed: 10.0";
+//     cout << "\nSpeed: 10.0";
        linear.set_speed (10.0);
        linear.set_target_speed (linear.speed());
        result = linear.interpolate (0, NUM_SAMPLES / 10, input, output);
@@ -93,9 +93,9 @@ void
 InterpolationTest::cubicInterpolationTest ()
 {
        nframes_t result = 0;
-       cout << "\nCubic Interpolation Test\n";
+//     cout << "\nCubic Interpolation Test\n";
 
-       cout << "\nSpeed: 1/3";
+//     cout << "\nSpeed: 1/3";
        for (int i = 0; 3*i < NUM_SAMPLES - 1024;) {
                cubic.set_speed (double(1.0)/double(3.0));
                cubic.set_target_speed (double(1.0)/double(3.0));
@@ -103,7 +103,7 @@ InterpolationTest::cubicInterpolationTest ()
                i += result;
        }
 
-       cout << "\nSpeed: 1.0";
+//     cout << "\nSpeed: 1.0";
        cubic.reset();
        cubic.set_speed (1.0);
        cubic.set_target_speed (cubic.speed());
@@ -113,7 +113,7 @@ InterpolationTest::cubicInterpolationTest ()
                CPPUNIT_ASSERT_EQUAL (1.0f, output[i]);
        }
 
-       cout << "\nSpeed: 0.5";
+//     cout << "\nSpeed: 0.5";
        cubic.reset();
        cubic.set_speed (0.5);
        cubic.set_target_speed (cubic.speed());
@@ -123,14 +123,14 @@ InterpolationTest::cubicInterpolationTest ()
                CPPUNIT_ASSERT_EQUAL (1.0f, output[i]);
        }
 
-       cout << "\nSpeed: 0.2";
+//     cout << "\nSpeed: 0.2";
        cubic.reset();
        cubic.set_speed (0.2);
        cubic.set_target_speed (cubic.speed());
        result = cubic.interpolate (0, NUM_SAMPLES, input, output);
        CPPUNIT_ASSERT_EQUAL ((uint32_t)(NUM_SAMPLES * cubic.speed()), result);
 
-       cout << "\nSpeed: 0.02";
+//     cout << "\nSpeed: 0.02";
        cubic.reset();
        cubic.set_speed (0.02);
        cubic.set_target_speed (cubic.speed());
@@ -147,7 +147,7 @@ InterpolationTest::cubicInterpolationTest ()
           CPPUNIT_ASSERT_EQUAL ((nframes_t)(NUM_SAMPLES * cubic.speed()), result);
           */
 
-       cout << "\nSpeed: 2.0";
+//     cout << "\nSpeed: 2.0";
        cubic.reset();
        cubic.set_speed (2.0);
        cubic.set_target_speed (cubic.speed());
@@ -157,7 +157,7 @@ InterpolationTest::cubicInterpolationTest ()
                CPPUNIT_ASSERT_EQUAL (1.0f, output[i]);
        }
 
-       cout << "\nSpeed: 10.0";
+//     cout << "\nSpeed: 10.0";
        cubic.set_speed (10.0);
        cubic.set_target_speed (cubic.speed());
        result = cubic.interpolate (0, NUM_SAMPLES / 10, input, output);