build: Cleanup and update of build scripts
Change-Id: I7fb5b8696d3b068249ae16b117bd27646d990dc3
diff --git a/tests/wscript b/tests/wscript
index 4f7301f..750f82d 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -5,10 +5,11 @@
if not bld.env['WITH_TESTS']:
return
- bld(target='../unit-tests',
- features='cxx cxxprogram',
+ tmp_path = 'TMP_TESTS_PATH="%s"' % bld.bldnode.make_node('tmp-files')
+ bld.program(
+ target='../unit-tests',
+ name='unit-tests',
source=bld.path.ant_glob(['*.cpp'] + ['%s/**/*.cpp' % tool for tool in bld.env['BUILD_TOOLS']]),
use=['core-objects'] + ['%s-objects' % tool for tool in bld.env['BUILD_TOOLS']],
- headers='../common.hpp boost-test.hpp',
install_path=None,
- defines='TMP_TESTS_PATH=\"%s/tmp-tests\"' % bld.bldnode)
+ defines=[tmp_path])