csdk: Install unit tests 81/24481/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 23 Mar 2018 10:44:47 +0000 (11:44 +0100)
committerMats Wichmann <mats@linux.com>
Fri, 6 Apr 2018 13:48:43 +0000 (13:48 +0000)
Bug: https://jira.iotivity.org/browse/IOT-524
Change-Id: Ie1e99e3c06d1723730d81621e78a941df1b031f9
Origin: https://gerrit.iotivity.org/gerrit/#/c/24481/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
resource/csdk/connectivity/test/SConscript
resource/csdk/security/unittest/SConscript
resource/csdk/stack/test/SConscript

index 9a7ed3c..6bea1c7 100644 (file)
@@ -115,9 +115,9 @@ if catest_env.get('SECURED') == '1' and catest_env.get('WITH_TCP') == True:
 if catest_env.get('SECURED') == '1':
     tests_src.append('cacertprofiletest.cpp')
 
-catests = catest_env.Program('catests', tests_src)
+catests = [catest_env.Program('catests', tests_src)]
 
-Alias("test", [catests])
+Alias("test", catests)
 
 catest_env.AppendTarget('test')
 if catest_env.get('TEST') == '1':
@@ -126,3 +126,6 @@ if catest_env.get('TEST') == '1':
         run_test(catest_env,
                  'resource_csdk_connectivity_test_catests.memcheck',
                  'resource/csdk/connectivity/test/catests')
+
+catest_env.UserInstallTargetExtra(catests, 'tests/resource/csdk/connectivity/')
+
index 5cfe8d5..be1fb4a 100644 (file)
@@ -88,7 +88,8 @@ else:
 ######################################################################
 # Source files and Targets
 ######################################################################
-unittest = srmtest_env.Program('unittest', [
+unittests = []
+unittests += srmtest_env.Program('unittest', [
     'aclresourcetest.cpp',
     'amaclresourcetest.cpp',
     'pstatresource.cpp',
@@ -118,7 +119,7 @@ srmtest_env.AppendUnique(CPPDEFINES=[
     'SECURITY_BUILD_UNITTEST_DIR=' + unittest_build_dir
 ])
 
-unittest += srmtest_env.ScanJSON('resource/csdk/security/unittest')
+unittests += srmtest_env.ScanJSON('resource/csdk/security/unittest')
 
 srmtest_env.AppendTarget('test')
 if srmtest_env.get('TEST') == '1':
@@ -132,3 +133,6 @@ if srmtest_env.get('TEST') == '1':
         run_test(srmtest_env,
                  'resource_csdk_security_unittest.memcheck',
                  'resource/csdk/security/unittest/unittest')
+
+srmtest_env.UserInstallTargetExtra(unittests, 'tests/resource/csdk/security/')
+
index adfa836..637f03b 100644 (file)
@@ -80,10 +80,11 @@ if target_os not in ['msys_nt', 'windows']:
 ######################################################################
 # Source files and Targets
 ######################################################################
-stacktests = stacktest_env.Program('stacktests', ['stacktests.cpp'])
-cbortests = stacktest_env.Program('cbortests', ['cbortests.cpp'])
+unittests = []
+unittests += stacktest_env.Program('stacktests', ['stacktests.cpp'])
+unittests += stacktest_env.Program('cbortests', ['cbortests.cpp'])
 
-Alias("test", [stacktests, cbortests])
+Alias("test", unittests)
 
 stacktest_env.AppendTarget('test')
 if stacktest_env.get('TEST') == '1':
@@ -94,3 +95,6 @@ if stacktest_env.get('TEST') == '1':
         run_test(stacktest_env,
                  'resource_csdk_stack_test_cbortests.memcheck',
                  'resource/csdk/stack/test/cbortests')
+
+stacktest_env.UserInstallTargetExtra(unittests, 'tests/resource/csdk/stack/')
+