diff options
| author | David Robillard <d@drobilla.net> | 2013-01-20 18:23:42 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-20 18:23:42 +0000 |
| commit | fa8d0268eb9488530a9544bd0ed2631636b129b7 (patch) | |
| tree | 6d313405b9be4a2a61eae6c40ce4d85bbfb521e6 /libs/ardour/test/combine_regions_test.cc | |
| parent | fc7b4b7f627e5238ee1cb48d1bbb36811b85b9ed (diff) | |
Fix compilation with --test.
Make midnam test suite pass again.
The Ardour test suite does not pass. I commented out old crossfade stuff, but
I am not familiar enough with the parts that fail to fix it. It might be a
good idea for someone to look into this. Ideally we'd have the test integrated
into everyone's workflow, but they add quite a few files to compile...
git-svn-id: svn://localhost/ardour2/branches/3.0@13931 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/test/combine_regions_test.cc')
| -rw-r--r-- | libs/ardour/test/combine_regions_test.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/test/combine_regions_test.cc b/libs/ardour/test/combine_regions_test.cc index 385a6e852f..0202fe8873 100644 --- a/libs/ardour/test/combine_regions_test.cc +++ b/libs/ardour/test/combine_regions_test.cc @@ -113,11 +113,13 @@ CombineRegionsTest::crossfadeTest1 () CPPUNIT_ASSERT_EQUAL (layer_t (0), _r[0]->layer ()); CPPUNIT_ASSERT_EQUAL (layer_t (1), _r[1]->layer ()); +#if 0 /* Check that the right fades have been set up */ CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_in_is_xfade ()); CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_out_is_xfade ()); CPPUNIT_ASSERT_EQUAL (true, _ar[1]->fade_in_is_xfade ()); CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_out_is_xfade ()); +#endif /* Check that the read comes back correctly */ check_crossfade1 (); @@ -217,12 +219,13 @@ CombineRegionsTest::crossfadeTest2 () CPPUNIT_ASSERT_EQUAL (layer_t (1), _r[0]->layer ()); CPPUNIT_ASSERT_EQUAL (layer_t (0), _r[1]->layer ()); +#if 0 /* Check that the right fades have been set up */ - CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_in_is_xfade ()); CPPUNIT_ASSERT_EQUAL (true, _ar[0]->fade_out_is_xfade ()); CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_in_is_xfade ()); CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_out_is_xfade ()); +#endif /* Check that the read comes back correctly */ check_crossfade2 (); |