ardour/livetrax
13
0
Fork 0
Code

Fix tests compilation

Browse Source
This commit is contained in:
Julien de Kozak 2013-03-29 21:01:17 +01:00
parent 27d77b8719
commit f0f26fb8d3
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/test/load_session.cc
View File

@ -10,6 +10,8 @@
using namespace std; using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
static const char* localedir = LOCALEDIR;
int main (int argc, char* argv[]) int main (int argc, char* argv[])
{ {
if (argc != 3) { if (argc != 3) {
@ -17,7 +19,7 @@ int main (int argc, char* argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
ARDOUR::init (false, true); ARDOUR::init (false, true, localedir);
Session* s = 0; Session* s = 0;

4
libs/ardour/test/profiling/load_session.cc
View File

@ -10,6 +10,8 @@
using namespace std; using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
static const char* localedir = LOCALEDIR;
int main (int argc, char* argv[]) int main (int argc, char* argv[])
{ {
if (argc != 3) { if (argc != 3) {
@ -17,7 +19,7 @@ int main (int argc, char* argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
ARDOUR::init (false, true); ARDOUR::init (false, true, localedir);
Session* s = 0; Session* s = 0;

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

@ -10,10 +10,12 @@ using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
static const char* localedir = LOCALEDIR;
int int
main (int argc, char* argv[]) 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"); Session* session = load_session ("../libs/ardour/test/profiling/sessions/1region", "1region");
assert (session->get_routes()->size() == 2); assert (session->get_routes()->size() == 2);

4
libs/ardour/test/profiling/runpc.cc
View File

@ -11,6 +11,8 @@ using namespace std;
using namespace PBD; using namespace PBD;
using namespace ARDOUR; using namespace ARDOUR;
static const char* localedir = LOCALEDIR;
int int
main (int argc, char* argv[]) main (int argc, char* argv[])
{ {
@ -19,7 +21,7 @@ main (int argc, char* argv[])
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
ARDOUR::init (false, true); ARDOUR::init (false, true, localedir);
Session* session = load_session ( Session* session = load_session (
string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]), string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]),

4
libs/ardour/test/testrunner.cc
View File

@ -11,6 +11,8 @@
#include "pbd/debug.h" #include "pbd/debug.h"
#include "ardour/ardour.h" #include "ardour/ardour.h"
static const char* localedir = LOCALEDIR;
int int
main(int argc, char* argv[]) 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; CppUnit::TestResult testresult;

8
libs/ardour/wscript
View File

@ -475,10 +475,10 @@ def build(bld):
# Tests that don't work # Tests that don't work
# test/mantis_3356_test.cc # 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', testobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
'SAMPLERATE','XML','LRDF','COREAUDIO'] 'SAMPLERATE','XML','LRDF','COREAUDIO']
testobj.use = ['libpbd','libmidipp','libardour'] testobj.use = ['libpbd','libmidipp','ardour','libltc','libaudiographer']
testobj.name = 'libardour-tests' testobj.name = 'libardour-tests'
testobj.target = 'run-tests' testobj.target = 'run-tests'
testobj.install_path = '' testobj.install_path = ''
@ -511,7 +511,7 @@ def build(bld):
session_load_tester.includes.append ('test') session_load_tester.includes.append ('test')
session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', session_load_tester.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
'SAMPLERATE','XML','LRDF','COREAUDIO'] '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.name = 'libardour-session-load-tester'
session_load_tester.target = 'load-session' session_load_tester.target = 'load-session'
session_load_tester.install_path = '' session_load_tester.install_path = ''
@ -546,7 +546,7 @@ def build(bld):
profilingobj.includes.append ('test') profilingobj.includes.append ('test')
profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD', profilingobj.uselib = ['CPPUNIT','SIGCPP','JACK','GLIBMM','GTHREAD',
'SAMPLERATE','XML','LRDF','COREAUDIO'] 'SAMPLERATE','XML','LRDF','COREAUDIO']
profilingobj.use = ['libpbd','libmidipp','libardour'] profilingobj.use = ['libpbd','libmidipp','ardour']
profilingobj.name = 'libardour-profiling' profilingobj.name = 'libardour-profiling'
profilingobj.target = p profilingobj.target = p
profilingobj.install_path = '' profilingobj.install_path = ''