Rename 'src' directory to 'ndn-cxx'
Change-Id: I14394023680901a86977313ca87fb017333614dd
Refs: #3084
diff --git a/tests/integrated/wscript b/tests/integrated/wscript
index 5d04422..21327a9 100644
--- a/tests/integrated/wscript
+++ b/tests/integrated/wscript
@@ -1,13 +1,12 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-from waflib import Utils
-
top = '../..'
def build(bld):
for test in bld.path.ant_glob('*.cpp'):
name = test.change_ext('').path_from(bld.path.get_bld())
- bld.program(target=name,
+ bld.program(name='test-%s' % name,
+ target=name,
source=[test],
- use='ndn-cxx tests-base BOOST',
+ use='tests-base',
install_path=None)
diff --git a/tests/wscript b/tests/wscript
index 720cf30..20c49da 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -1,7 +1,5 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-from waflib import Utils
-
top = '..'
def build(bld):
@@ -9,7 +7,7 @@
bld.objects(target='tests-base',
features='pch',
source=bld.path.ant_glob('*.cpp', excl=['main.cpp']),
- headers=['../src/common-pch.hpp', 'boost-test.hpp'],
+ headers=['../ndn-cxx/common-pch.hpp', 'boost-test.hpp'],
includes='.',
export_includes='.',
use='ndn-cxx BOOST')
@@ -17,7 +15,7 @@
config_path = 'UNIT_TEST_CONFIG_PATH="%s"' % bld.bldnode.make_node('tmp-files')
# unit test objects
- src = bld.path.ant_glob(['unit-tests/**/*.cpp'],
+ src = bld.path.ant_glob('unit-tests/**/*.cpp',
excl=['**/*-osx.t.cpp', '**/*-sqlite3.t.cpp'])
if bld.env['HAVE_OSX_FRAMEWORKS']:
src += bld.path.ant_glob('unit-tests/**/*-osx.t.cpp')
@@ -25,7 +23,7 @@
# In case we want to make it optional later
src += bld.path.ant_glob('unit-tests/**/*-sqlite3.t.cpp')
- bld.objects(target='unit-test-objects',
+ bld.objects(target='unit-tests-objects',
source=src,
use='tests-base',
defines=[config_path])
@@ -34,7 +32,7 @@
bld.program(target='../unit-tests',
name='unit-tests',
source='main.cpp',
- use='unit-test-objects',
+ use='unit-tests-objects',
install_path=None)
bld.recurse('integrated')