resource-encapsulation: Install unit tests 43/26543/3
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 23 Mar 2018 10:46:15 +0000 (11:46 +0100)
committerMats Wichmann <mats@linux.com>
Tue, 21 Aug 2018 14:07:56 +0000 (14:07 +0000)
Bug: https://jira.iotivity.org/browse/IOT-524
Change-Id: Ic88f9bae3137c439518901084d77285ace964d99
Origin: https://gerrit.iotivity.org/gerrit/#/c/26515/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
service/resource-encapsulation/src/common/primitiveResource/unittests/SConscript
service/resource-encapsulation/src/resourceBroker/unittest/SConscript
service/resource-encapsulation/src/resourceCache/unittests/SConscript
service/resource-encapsulation/src/serverBuilder/SConscript
service/resource-encapsulation/unittests/SConscript

index d8c483b..5616071 100644 (file)
@@ -51,6 +51,8 @@ rcs_common_test_src = [
 ]
 
 rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
+rcs_common_test_env.UserInstallTargetExtra(rcs_common_test, 'tests/service/resource-encapsulation/src/common/primitiveResource')
+
 Alias("rcs_common_test", rcs_common_test)
 rcs_common_test_env.AppendTarget('rcs_common_test')
 
index a645ced..6a372a5 100644 (file)
@@ -89,6 +89,8 @@ broker_test_src = broker_test_env.Glob('./*.cpp')
 broker_test = broker_test_env.Program('broker_test', broker_test_src)
 Alias("broker_test", broker_test)
 broker_test_env.AppendTarget('broker_test')
+broker_test_env.UserInstallTargetExtra(broker_test,'tests/service/resource-encapsulation/src/resourceBroker/')
+
 
 if broker_test_env.get('TEST') == '1':
     if target_os in ['linux']:
index 776f4a0..3459c7d 100644 (file)
@@ -85,6 +85,7 @@ cache_test_src = cache_test_env.Glob('./*.cpp')
 cache_test = cache_test_env.Program('cache_test', cache_test_src)
 Alias("cache_test", cache_test)
 cache_test_env.AppendTarget('cache_test')
+cache_test_env.UserInstallTargetExtra(cache_test,'tests/service/resource-encapsulation/src/resourceCache/')
 
 if cache_test_env.get('TEST') == '1':
     if target_os in ['linux']:
index bac6847..a9eaa03 100644 (file)
@@ -126,7 +126,8 @@ if server_builder_env.get('WITH_TEST') and target_os in ('linux'):
         'rcs_server_test', server_builder_test_src)
     Alias("rcs_server_test", server_builder_test)
     server_builder_test_env.AppendTarget('rcs_server_test')
-
+    server_builder_test_env.UserInstallTargetExtra(server_builder_test,'tests/service/resource-encapsulation/src/serverBuilder/')
+    
     if server_builder_test_env.get('TEST') == '1':
         server_builder_test_env.AppendUnique(CPPDEFINES=['HIPPOMOCKS_ISSUE'])
         # this import needs to remain here so it is protected by target check
index 1bbb208..f3059e6 100644 (file)
@@ -89,13 +89,14 @@ if 'g++' in rcs_test_env.get('CXX'):
 # Build Test
 ######################################################################
 rcs_test_src = rcs_test_env.Glob('./*.cpp')
-
+unittests = []
 rcs_client_test = rcs_test_env.Program('rcs_client_test', rcs_test_src)
 Alias("rcs_client_test", rcs_client_test)
 rcs_test_env.AppendTarget('rcs_client_test')
-
-actions = rcs_test_env.ScanJSON('service/resource-encapsulation/unittests')
-rcs_test_env.Alias("install", actions)
+unittests += rcs_client_test;
+unittests += rcs_test_env.ScanJSON('service/resource-encapsulation/unittests')
+rcs_test_env.Alias("install", unittests)
+rcs_test_env.UserInstallTargetExtra(unittests,'tests/service/resource-encapsulation/')
 
 if rcs_test_env.get('TEST') == '1':
     if target_os in ['linux']: