IOT-1213 Fix build failure for test build
authorGeorge Nash <george.nash@intel.com>
Fri, 12 Aug 2016 21:49:27 +0000 (14:49 -0700)
committerJon A. Cruz <jon@joncruz.org>
Tue, 30 Aug 2016 20:25:14 +0000 (20:25 +0000)
When building with TEST=1 the build failed reporting
multiple environments were trying to build the target 'ut'

This was a hardcoded dummy target that is used to force the
unit tests to run.  The dummy target was switched from the
hardcoded 'ut' name to use the name of the unit test so two
environments don't think they are building the same target.

Change-Id: I9ac35752f0a1c7acf902bf0087a212833bf5a6a5
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10443
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
tools/scons/RunTest.py

index 1a429f6..d10a177 100644 (file)
@@ -63,5 +63,5 @@ def run_test(env, xml_file, test):
         # Set up to run the test under Valgrind.
         test_cmd = '%s valgrind --leak-check=full --suppressions=%s --xml=yes --xml-file=%s %s' % (valgrind_environment, suppression_file, xml_file, test_cmd)
 
-    ut = env.Command('ut', None, test_cmd)
-    env.AlwaysBuild('ut')
+    ut = env.Command('ut' + test, None, test_cmd)
+    env.AlwaysBuild('ut' + test)