resource-container: Install unit tests 79/24479/4
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 23 Mar 2018 10:44:03 +0000 (11:44 +0100)
committerMats Wichmann <mats@linux.com>
Sat, 7 Apr 2018 17:08:22 +0000 (17:08 +0000)
Bug: https://jira.iotivity.org/browse/IOT-524
Change-Id: I1b88b500f18445ea145c24a8e52ea07c6b11c521
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
service/resource-container/unittests/SConscript

index e34de1e..1dbe0f3 100644 (file)
@@ -158,6 +158,7 @@ if container_gtest_env.get('SECURED') == '1':
 if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
     container_gtest_env.AppendUnique(LIBS=['resource_directory'])
 
+unittests = []
 ######################################################################
 # build test bundle
 ######################################################################
@@ -174,6 +175,7 @@ test_bundle_src = [Glob(TEST_BUNDLE_DIR + 'src/*.cpp'), Glob('src/*.cpp')]
 
 TestBundle = test_bundle_env.SharedLibrary('TestBundle', test_bundle_src)
 test_bundle_env.InstallTarget(TestBundle, 'libTestBundle')
+unittests += TestBundle
 
 ######################################################################
 # Build Test
@@ -187,17 +189,17 @@ container_test = container_gtest_env.Program('container_test',
                                              container_gtest_src)
 Alias("container_test", container_test)
 container_gtest_env.AppendTarget('container_test')
-
+unittests += container_test
 # Copy test configuration
-Command("./ResourceContainerTestConfig.xml",
+unittests += Command("./ResourceContainerTestConfig.xml",
         "./ResourceContainerTestConfig.xml", Copy("$TARGET", "$SOURCE"))
 Ignore("./ResourceContainerTestConfig.xml",
        "./ResourceContainerTestConfig.xml")
-Command("./ResourceContainerInvalidConfig.xml",
+unittests += Command("./ResourceContainerInvalidConfig.xml",
         "./ResourceContainerInvalidConfig.xml", Copy("$TARGET", "$SOURCE"))
 Ignore("./ResourceContainerInvalidConfig.xml",
        "./ResourceContainerInvalidConfig.xml")
-Command("./TestBundleJava/hue-0.1-jar-with-dependencies.jar",
+unittests += Command("./TestBundleJava/hue-0.1-jar-with-dependencies.jar",
         "./TestBundleJava/hue-0.1-jar-with-dependencies.jar",
         Copy("$TARGET", "$SOURCE"))
 Ignore("./TestBundleJava/hue-0.1-jar-with-dependencies.jar",
@@ -213,3 +215,6 @@ if container_gtest_env.get('TEST') == '1':
             '',
             'service/resource-container/unittests/container_test',
             container_test)
+
+container_gtest_env.UserInstallTargetExtra(unittests,'tests/service/resource-container')
+