diff options
-rw-r--r-- | libs/ardour/test/audio_region_read_test.cc | 1 | ||||
-rw-r--r-- | libs/ardour/test/audio_region_test.cc | 1 | ||||
-rw-r--r-- | libs/ardour/test/playlist_read_test.cc | 1 | ||||
-rw-r--r-- | libs/ardour/test/test_globals.cc | 3 | ||||
-rw-r--r-- | libs/ardour/test/test_globals.h | 2 | ||||
-rw-r--r-- | libs/ardour/wscript | 2 |
6 files changed, 1 insertions, 9 deletions
diff --git a/libs/ardour/test/audio_region_read_test.cc b/libs/ardour/test/audio_region_read_test.cc index dc3127ea2e..6a8e3600f1 100644 --- a/libs/ardour/test/audio_region_read_test.cc +++ b/libs/ardour/test/audio_region_read_test.cc @@ -20,7 +20,6 @@ #include "ardour/region.h" #include "ardour/audioregion.h" #include "audio_region_read_test.h" -#include "test_globals.h" CPPUNIT_TEST_SUITE_REGISTRATION (AudioRegionReadTest); diff --git a/libs/ardour/test/audio_region_test.cc b/libs/ardour/test/audio_region_test.cc index f5ecfc7d88..69f67d21ec 100644 --- a/libs/ardour/test/audio_region_test.cc +++ b/libs/ardour/test/audio_region_test.cc @@ -27,7 +27,6 @@ #include "ardour/audioregion.h" #include "ardour/audioplaylist.h" #include "audio_region_test.h" -#include "test_globals.h" #include "test_common.h" using namespace std; diff --git a/libs/ardour/test/playlist_read_test.cc b/libs/ardour/test/playlist_read_test.cc index 54b0bc4fd5..78b2e4eadd 100644 --- a/libs/ardour/test/playlist_read_test.cc +++ b/libs/ardour/test/playlist_read_test.cc @@ -22,7 +22,6 @@ #include "ardour/audioregion.h" #include "ardour/session.h" #include "playlist_read_test.h" -#include "test_globals.h" CPPUNIT_TEST_SUITE_REGISTRATION (PlaylistReadTest); diff --git a/libs/ardour/test/test_globals.cc b/libs/ardour/test/test_globals.cc deleted file mode 100644 index e40f951d75..0000000000 --- a/libs/ardour/test/test_globals.cc +++ /dev/null @@ -1,3 +0,0 @@ -#include "test_globals.h" - -int const Fs = 44100; diff --git a/libs/ardour/test/test_globals.h b/libs/ardour/test/test_globals.h deleted file mode 100644 index ccd5c27384..0000000000 --- a/libs/ardour/test/test_globals.h +++ /dev/null @@ -1,2 +0,0 @@ - -extern int const Fs; diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 96932495f4..e91d019dd5 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -396,7 +396,7 @@ def build(bld): # only build these common sources once testcommon = bld(features = 'cxx') testcommon.includes = obj.includes + ['test', '../pbd', '..'] - testcommon.source = ['test/test_globals.cc', 'test/testrunner.cc', 'test/test_needing_session.cc', + testcommon.source = ['test/testrunner.cc', 'test/test_needing_session.cc', 'test/test_common.cc', 'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc'] testcommon.uselib = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] |