From 0845ec583f6eca32b828745d93e8549adbf3c672 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 29 Nov 2016 15:07:08 +0100 Subject: [PATCH] build: use tools.scons.RunTest for provisioning tests To avoid race conditions Bug: https://jira.iotivity.org/browse/IOT-1526 Change-Id: I8f1e4823a7c4642b4b03fb4dca924447079d7e39 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/14913 Tested-by: jenkins-iotivity Reviewed-by: George Nash (cherry picked from commit 6b309e20370eafe2780007ae13cbbdba2612fe6e) Reviewed-on: https://gerrit.iotivity.org/gerrit/14917 --- resource/provisioning/unittests/SConscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript index 2b53998..ba7a58b 100755 --- a/resource/provisioning/unittests/SConscript +++ b/resource/provisioning/unittests/SConscript @@ -20,6 +20,7 @@ import os import os.path +from tools.scons.RunTest import run_test # SConscript file for Local PKI google tests gtest_env = SConscript('#extlibs/gtest/SConscript') @@ -105,8 +106,9 @@ if provisiontests_env.get('TEST') == '1': os.makedirs(result_dir) provisiontests_env.AppendENVPath('GTEST_OUTPUT', ['xml:'+ result_dir]) provisiontests_env.AppendENVPath('LD_LIBRARY_PATH', [out_dir]) - ut = provisiontests_env.Command ('ut', None, out_dir + 'resource/provisioning/unittests/provisiontests') - AlwaysBuild ('ut') + run_test(provisiontests_env, + 'resource_provisioning_unittests.memcheck', + 'resource/provisioning/unittests/provisiontests') src_dir = provisiontests_env.get('SRC_DIR') svr_db_src_dir = src_dir + '/resource/provisioning/examples/' -- 2.7.4