ardour/livetrax
13
0
Fork 0
Code

Fix building libardour unit-tests, disable BBT tests for now

Browse Source
This commit is contained in:
Robin Gareus 2022-01-03 00:24:05 +01:00
parent e295e1c8d7
commit 987df219e0
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
7 changed files with 69 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/ardour/test/automation_list_property_test.cc
View File

@ -43,6 +43,21 @@ write_automation_list_xml (XMLNode* node, std::string filename)
CPPUNIT_ASSERT (write_ref (node, output_file));
}
static int
static_sample_rate () { return 48000; }
void
AutomationListPropertyTest::setUp ()
{
Temporal::set_sample_rate_callback (static_sample_rate);
}
void
AutomationListPropertyTest::tearDown ()
{
Temporal::set_sample_rate_callback (0);
}
void
AutomationListPropertyTest::basicTest ()
{
@ -53,7 +68,7 @@ AutomationListPropertyTest::basicTest ()
descriptor.property_id = g_quark_from_static_string ("FadeIn");
AutomationListProperty property (
descriptor,
boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation)))
boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime))
);
property.clear_changes ();
@ -61,8 +76,8 @@ AutomationListPropertyTest::basicTest ()
/* No change since we just cleared them */
CPPUNIT_ASSERT_EQUAL (false, property.changed());
property->add (1, 0.5, false, false);
property->add (3, 2.0, false, false);
property->add (timepos_t(1), 0.5, false, false);
property->add (timepos_t(3), 2.0, false, false);
/* Now it has changed */
CPPUNIT_ASSERT_EQUAL (true, property.changed());
@ -83,8 +98,8 @@ AutomationListPropertyTest::basicTest ()
/* Do some more */
property.clear_changes ();
CPPUNIT_ASSERT_EQUAL (false, property.changed());
property->add (5, 1.5, false, false);
property->add (7, 1.0, false, false);
property->add (timepos_t(5), 1.5, false, false);
property->add (timepos_t(7), 1.0, false, false);
CPPUNIT_ASSERT_EQUAL (true, property.changed());
delete foo;
foo = new XMLNode ("test");
@ -99,7 +114,7 @@ class Fred : public StatefulDestructible
{
public:
Fred ()
: _jim (_descriptor, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation))))
: _jim (_descriptor, boost::shared_ptr<AutomationList> (new AutomationList (Evoral::Parameter (FadeInAutomation), Temporal::AudioTime)))
{
add_property (_jim);
@ -137,13 +152,13 @@ AutomationListPropertyTest::undoTest ()
boost::shared_ptr<Fred> sheila (new Fred);
/* Add some data */
sheila->_jim->add (0, 1, false, false);
sheila->_jim->add (1, 2, false, false);
sheila->_jim->add (timepos_t(0), 1, false, false);
sheila->_jim->add (timepos_t(1), 2, false, false);
/* Do a `command' */
sheila->clear_changes ();
sheila->_jim->add (2, 1, false, false);
sheila->_jim->add (3, 0, false, false);
sheila->_jim->add (timepos_t(2), 1, false, false);
sheila->_jim->add (timepos_t(3), 0, false, false);
StatefulDiffCommand sdc (sheila);
std::string test_data_filename = "automation_list_property_test3.ref";

2
libs/ardour/test/automation_list_property_test.h
View File

@ -27,6 +27,8 @@ class AutomationListPropertyTest : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE_END ();
public:
void setUp ();
void tearDown ();
void basicTest ();
void undoTest ();
};

14
libs/ardour/test/playlist_equivalent_regions_test.cc
View File

@ -49,10 +49,10 @@ void
PlaylistEquivalentRegionsTest::basicsTest ()
{
/* Put _r[0] on _playlist */
_playlist->add_region (_r[0], 42);
_playlist->add_region (_r[0], timepos_t(42));
/* And _r[1] on _playlist_b at the same position */
_playlist_b->add_region (_r[1], 42);
_playlist_b->add_region (_r[1], timepos_t(42));
/* Look for the equivalents to _r[0] on _playlist_b */
vector<boost::shared_ptr<Region> > e;
@ -63,7 +63,7 @@ PlaylistEquivalentRegionsTest::basicsTest ()
CPPUNIT_ASSERT_EQUAL (e.front(), _r[1]);
/* Move _r[1] */
_r[1]->set_position (66);
_r[1]->set_position (timepos_t (66));
/* Look again for the equivalents to _r[0] on _playlist_b */
e.clear ();
@ -80,12 +80,12 @@ PlaylistEquivalentRegionsTest::multiLayerTest ()
_playlist_b->clear ();
/* Put _r[0] and _r[1] at the same position on _playlist so that they overlap */
_playlist->add_region (_r[0], 42);
_playlist->add_region (_r[1], 42);
_playlist->add_region (_r[0], timepos_t(42));
_playlist->add_region (_r[1], timepos_t(42));
/* And _r[2], _r[3] similarly on _playlist_b */
_playlist_b->add_region (_r[2], 42);
_playlist_b->add_region (_r[3], 42);
_playlist_b->add_region (_r[2], timepos_t(42));
_playlist_b->add_region (_r[3], timepos_t(42));
RegionEquivalence re = Config->get_region_equivalence();

8
libs/ardour/test/playlist_layering_test.cc
View File

@ -28,15 +28,15 @@ using namespace ARDOUR;
void
PlaylistLayeringTest::basicsTest ()
{
_playlist->add_region (_r[0], 0);
_playlist->add_region (_r[1], 10);
_playlist->add_region (_r[2], 20);
_playlist->add_region (_r[0], timepos_t(0));
_playlist->add_region (_r[1], timepos_t(10));
_playlist->add_region (_r[2], timepos_t(20));
CPPUNIT_ASSERT_EQUAL (layer_t (0), _r[0]->layer ());
CPPUNIT_ASSERT_EQUAL (layer_t (1), _r[1]->layer ());
CPPUNIT_ASSERT_EQUAL (layer_t (2), _r[2]->layer ());
_r[0]->set_position (5);
_r[0]->set_position (timepos_t(5));
/* region move should have no effect */
CPPUNIT_ASSERT_EQUAL (layer_t (0), _r[0]->layer ());

6
libs/ardour/test/profiling/lots_of_regions.cc
View File

@ -40,7 +40,8 @@ main (int argc, char* argv[])
/* Duplicate it a lot */
session->begin_reversible_command ("foo");
playlist->clear_changes ();
playlist->duplicate (region, region->last_sample() + 1, 1000);
timepos_t pos (region->last_sample() + 1);
playlist->duplicate (region, pos, 1000);
session->add_command (new StatefulDiffCommand (playlist));
session->commit_reversible_command ();
@ -50,7 +51,8 @@ main (int argc, char* argv[])
/* And do it again */
session->begin_reversible_command ("foo");
playlist->clear_changes ();
playlist->duplicate (region, region->last_sample() + 1, 1000);
timepos_t pos2 (region->last_sample() + 1);
playlist->duplicate (region, pos2, 1000);
session->add_command (new StatefulDiffCommand (playlist));
session->commit_reversible_command ();

2
libs/ardour/test/test_util.cc
View File

@ -107,6 +107,7 @@ create_and_start_dummy_backend ()
CPPUNIT_ASSERT (engine->set_backend ("None (Dummy)", "Unit-Test", ""));
CPPUNIT_ASSERT (engine->start () == 0);
Temporal::set_sample_rate_callback (AudioEngine::static_sample_rate);
}
void
@ -115,6 +116,7 @@ stop_and_destroy_backend ()
AudioEngine::instance()->remove_session ();
AudioEngine::instance()->stop ();
AudioEngine::destroy ();
Temporal::set_sample_rate_callback (0);
}
/** @param dir Session directory.

50
libs/ardour/wscript
View File

@ -584,14 +584,14 @@ def build(bld):
if bld.env['SINGLE_TESTS']:
create_ardour_test_program(bld, obj.includes, 'unit-test-audio_engine', 'test_audio_engine', ['test/audio_engine_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-automation_list_property', 'test_automation_list_property', ['test/automation_list_property_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-bbt', 'test_bbt', ['test/bbt_test.cc'])
#create_ardour_test_program(bld, obj.includes, 'unit-test-bbt', 'test_bbt', ['test/bbt_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-fpu', 'test_fpu', ['test/fpu_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-tempo', 'test_tempo', ['test/tempo_test.cc'])
#create_ardour_test_program(bld, obj.includes, 'unit-test-tempo', 'test_tempo', ['test/tempo_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-lua_script', 'test_lua_script', ['test/lua_script_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-midi_clock', 'test_midi_clock', ['test/midi_clock_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-resampled_source', 'test_resampled_source', ['test/resampled_source_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-samplewalk_to_beats', 'test_samplewalk_to_beats', ['test/samplewalk_to_beats_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-samplepos_plus_beats', 'test_samplepos_plus_beats', ['test/samplepos_plus_beats_test.cc'])
#create_ardour_test_program(bld, obj.includes, 'unit-test-samplewalk_to_beats', 'test_samplewalk_to_beats', ['test/samplewalk_to_beats_test.cc'])
#create_ardour_test_program(bld, obj.includes, 'unit-test-samplepos_plus_beats', 'test_samplepos_plus_beats', ['test/samplepos_plus_beats_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-playlist_equivalent_regions', 'test_playlist_equivalent_regions', ['test/playlist_equivalent_regions_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-playlist_layering', 'test_playlist_layering', ['test/playlist_layering_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-plugins', 'test_plugins', ['test/plugins_test.cc'])
@ -602,27 +602,27 @@ def build(bld):
create_ardour_test_program(bld, obj.includes, 'unit-test-session', 'test_session', ['test/session_test.cc'])
create_ardour_test_program(bld, obj.includes, 'unit-test-dsp_load_calculator', 'test_dsp_load_calculator', ['test/dsp_load_calculator_test.cc'])
test_sources = '''
test/audio_engine_test.cc
test/automation_list_property_test.cc
test/bbt_test.cc
test/dsp_load_calculator_test.cc
test/fpu_test.cc
test/tempo_test.cc
test/lua_script_test.cc
test/midi_clock_test.cc
test/resampled_source_test.cc
test/samplewalk_to_beats_test.cc
test/samplepos_plus_beats_test.cc
test/playlist_equivalent_regions_test.cc
test/playlist_layering_test.cc
test/plugins_test.cc
test/region_naming_test.cc
test/control_surfaces_test.cc
test/mtdm_test.cc
test/sha1_test.cc
test/session_test.cc
'''.split()
test_sources = [
'test/audio_engine_test.cc',
'test/automation_list_property_test.cc',
#'test/bbt_test.cc',
'test/dsp_load_calculator_test.cc',
'test/fpu_test.cc',
#'test/tempo_test.cc',
'test/lua_script_test.cc',
'test/midi_clock_test.cc',
'test/resampled_source_test.cc',
#'test/samplewalk_to_beats_test.cc',
#'test/samplepos_plus_beats_test.cc',
'test/playlist_equivalent_regions_test.cc',
'test/playlist_layering_test.cc',
'test/plugins_test.cc',
'test/region_naming_test.cc',
'test/control_surfaces_test.cc',
'test/mtdm_test.cc',
'test/sha1_test.cc',
'test/session_test.cc',
]
# Tests that don't work
# test/playlist_read_test.cc