From 7dda698e3b7569eeb9189c33d5cc4805b825f768 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Sat, 10 Dec 2016 00:09:48 +0100 Subject: [PATCH] build: Enable resource-container unittests Bug: https://jira.iotivity.org/browse/IOT-1428 Change-Id: I9f1a933e41e832df3ef407a76f3c1300cde2f20a Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/15393 Tested-by: jenkins-iotivity Reviewed-by: George Nash Reviewed-by: Mats Wichmann --- service/resource-container/unittests/SConscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/service/resource-container/unittests/SConscript b/service/resource-container/unittests/SConscript index fd8a6d0..65f27bb 100644 --- a/service/resource-container/unittests/SConscript +++ b/service/resource-container/unittests/SConscript @@ -179,11 +179,11 @@ Ignore("./ResourceContainerInvalidConfig.xml", "./ResourceContainerInvalidConfig 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", "./TestBundleJava/hue-0.1-jar-with-dependencies.jar") +# TODO: fix this test and edit commented lines if container_gtest_env.get('TEST') == '1': -# TODO: fix this test on linux and remove this comment line - if target_os in []: + if target_os in ['linux'] and container_gtest_env.get('SECURED') != '1': from tools.scons.RunTest import run_test run_test(container_gtest_env, -# 'service_resource-container_unittests_container_test.memcheck', - '', - 'service/resource-container/unittests/container_test') +# 'service_resource-container_unittests_container_test.memcheck', + '', + 'service/resource-container/unittests/container_test') -- 2.7.4