13
0

* add waf option to enable compilation of unit tests

* libs/ardour: make filenames of unit tests compy with the convention

git-svn-id: svn://localhost/ardour2/branches/3.0@6583 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2010-01-29 05:17:44 +00:00
parent d978f102f5
commit 0c6c45fc68
7 changed files with 15 additions and 8 deletions

View File

@ -10,7 +10,8 @@ cd ../../build/default
libs='libs'
export LD_LIBRARY_PATH=$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$libs/audiographer:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/sigc++2:$libs/glibmm2:$libs/gtkmm2/atk:$libs/gtkmm2/pango:$libs/gtkmm2/gdk:$libs/gtkmm2/gtk:$libs/libgnomecanvasmm:$libs/libsndfile:$libs/appleutility:$libs/cairomm:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$LD_LIBRARY_PATH
echo $LD_LIBRARY_PATH
./libs/ardour/run-tests
echo LD_LIBRARY_PATH = $LD_LIBRARY_PATH
gdb ./libs/ardour/run-tests

View File

@ -1,6 +1,6 @@
#include <cassert>
#include "ardour/tempo.h"
#include "BBTTest.hpp"
#include "bbt_test.h"
CPPUNIT_TEST_SUITE_REGISTRATION(BBTTest);

View File

@ -1,5 +1,5 @@
#include <sigc++/sigc++.h>
#include "InterpolationTest.h"
#include "interpolation_test.h"
CPPUNIT_TEST_SUITE_REGISTRATION(InterpolationTest);

View File

@ -321,8 +321,8 @@ def build(bld):
# Unit tests
testobj = bld.new_task_gen('cxx', 'program')
testobj.source = '''
test/BBTTest.cpp
test/InterpolationTest.cpp
test/bbt_test.cpp
test/interpolation_test.cpp
test/testrunner.cpp
'''.split()
testobj.includes = obj.includes + ['../pbd/']

View File

@ -343,6 +343,8 @@ def set_options(opt):
opt.add_option('--no-nls', action='store_false', dest='nls')
opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug',
help='Build with debugging for the STL')
opt.add_option('--test', action='store_true', default=False, dest='build_tests',
help="Build unit tests")
opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
opt.add_option('--universal', action='store_true', default=False, dest='universal',
@ -464,6 +466,7 @@ def configure(conf):
okmsg = 'ok',
errmsg = 'too old\nPlease install boost version 1.39 or higher.')
autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False)
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.2')
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2')
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.14.0')
@ -479,7 +482,7 @@ def configure(conf):
conf.env.append_value('CCFLAGS', '-DWAF_BUILD')
conf.env.append_value('CXXFLAGS', '-DWAF_BUILD')
autowaf.print_summary(conf)
opts = Options.options
autowaf.display_header('Ardour Configuration')
@ -510,6 +513,9 @@ def configure(conf):
if opts.nls:
conf.define ('ENABLE_NLS', 1)
autowaf.display_msg(conf, 'Tranzport', opts.tranzport)
if opts.build_tests:
conf.env['BUILD_TESTS'] = opts.build_tests
autowaf.display_msg(conf, 'Unit Tests', bool(conf.env['BUILD_TESTS']) and bool (conf.env['HAVE_CPPUNIT']))
if opts.tranzport:
conf.define('TRANZPORT', 1)
autowaf.display_msg(conf, 'Universal Binary', opts.universal)