From f0f26fb8d31451d7155e8eac7d6ee098bbe1a91d Mon Sep 17 00:00:00 2001 From: Julien de Kozak Date: Fri, 29 Mar 2013 21:01:17 +0100 Subject: [PATCH] Fix tests compilation --- libs/ardour/test/load_session.cc | 4 +++- libs/ardour/test/profiling/load_session.cc | 4 +++- libs/ardour/test/profiling/lots_of_regions.cc | 4 +++- libs/ardour/test/profiling/runpc.cc | 4 +++- libs/ardour/test/testrunner.cc | 4 +++- libs/ardour/wscript | 8 ++++---- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libs/ardour/test/load_session.cc b/libs/ardour/test/load_session.cc index 3c6bd9bb10..3f56e63577 100644 --- a/libs/ardour/test/load_session.cc +++ b/libs/ardour/test/load_session.cc @@ -10,6 +10,8 @@ using namespace std; using namespace ARDOUR; +static const char* localedir = LOCALEDIR; + int main (int argc, char* argv[]) { if (argc != 3) { @@ -17,7 +19,7 @@ int main (int argc, char* argv[]) exit (EXIT_FAILURE); } - ARDOUR::init (false, true); + ARDOUR::init (false, true, localedir); Session* s = 0; diff --git a/libs/ardour/test/profiling/load_session.cc b/libs/ardour/test/profiling/load_session.cc index 3c6bd9bb10..3f56e63577 100644 --- a/libs/ardour/test/profiling/load_session.cc +++ b/libs/ardour/test/profiling/load_session.cc @@ -10,6 +10,8 @@ using namespace std; using namespace ARDOUR; +static const char* localedir = LOCALEDIR; + int main (int argc, char* argv[]) { if (argc != 3) { @@ -17,7 +19,7 @@ int main (int argc, char* argv[]) exit (EXIT_FAILURE); } - ARDOUR::init (false, true); + ARDOUR::init (false, true, localedir); Session* s = 0; diff --git a/libs/ardour/test/profiling/lots_of_regions.cc b/libs/ardour/test/profiling/lots_of_regions.cc index 5c27e8425a..3a45d77067 100644 --- a/libs/ardour/test/profiling/lots_of_regions.cc +++ b/libs/ardour/test/profiling/lots_of_regions.cc @@ -10,10 +10,12 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +static const char* localedir = LOCALEDIR; + int main (int argc, char* argv[]) { - ARDOUR::init (false, true); + ARDOUR::init (false, true, localedir); Session* session = load_session ("../libs/ardour/test/profiling/sessions/1region", "1region"); assert (session->get_routes()->size() == 2); diff --git a/libs/ardour/test/profiling/runpc.cc b/libs/ardour/test/profiling/runpc.cc index ef5d322df2..ddbd463234 100644 --- a/libs/ardour/test/profiling/runpc.cc +++ b/libs/ardour/test/profiling/runpc.cc @@ -11,6 +11,8 @@ using namespace std; using namespace PBD; using namespace ARDOUR; +static const char* localedir = LOCALEDIR; + int main (int argc, char* argv[]) { @@ -19,7 +21,7 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - ARDOUR::init (false, true); + ARDOUR::init (false, true, localedir); Session* session = load_session ( string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]), diff --git a/libs/ardour/test/testrunner.cc b/libs/ardour/test/testrunner.cc index 2f932c62da..e72cb5c4fd 100644 --- a/libs/ardour/test/testrunner.cc +++ b/libs/ardour/test/testrunner.cc @@ -11,6 +11,8 @@ #include "pbd/debug.h" #include "ardour/ardour.h" +static const char* localedir = LOCALEDIR; + int main(int argc, char* argv[]) { @@ -45,7 +47,7 @@ main(int argc, char* argv[]) } } - ARDOUR::init (false, true); + ARDOUR::init (false, true, localedir); CppUnit::TestResult testresult; diff --git a/libs/ardour/wscript b/libs/ardour/wscript index e43cae4131..782cb7be1c 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -475,10 +475,10 @@ def build(bld): # Tests that don't work # test/mantis_3356_test.cc - testobj.includes = obj.includes + ['test', '../pbd'] + testobj.includes = obj.includes + ['test', '../pbd', '../libltc', '../audiographer'] testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - testobj.use = ['libpbd','libmidipp','libardour'] + testobj.use = ['libpbd','libmidipp','ardour','libltc','libaudiographer'] testobj.name = 'libardour-tests' testobj.target = 'run-tests' testobj.install_path = '' @@ -511,7 +511,7 @@ def build(bld): session_load_tester.includes.append ('test') session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - session_load_tester.use = ['libpbd','libmidipp','libardour'] + session_load_tester.use = ['libpbd','libmidipp','ardour'] session_load_tester.name = 'libardour-session-load-tester' session_load_tester.target = 'load-session' session_load_tester.install_path = '' @@ -546,7 +546,7 @@ def build(bld): profilingobj.includes.append ('test') profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', 'SAMPLERATE','XML','LRDF','COREAUDIO'] - profilingobj.use = ['libpbd','libmidipp','libardour'] + profilingobj.use = ['libpbd','libmidipp','ardour'] profilingobj.name = 'libardour-profiling' profilingobj.target = p profilingobj.install_path = ''