X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Funit_tests.scons;h=fd18284f705feab598cfcae071721c01f3bb86f1;hb=b0eb04f1699539c45bbb75e186c6910a239ede3d;hp=06e50c134720f2e52f357a49a843bfd5b1ed4960;hpb=d0baf5ae6936a16de6a49588428204d8c386ac9e;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/unit_tests.scons b/resource/unit_tests.scons
index 06e50c1..fd18284 100644
--- a/resource/unit_tests.scons
+++ b/resource/unit_tests.scons
@@ -29,28 +29,29 @@ target_os = env.get('TARGET_OS')
 src_dir = env.get('SRC_DIR')
 build_dir = env.get('BUILD_DIR')
 
-if target_os == 'linux':
+if target_os in ['linux']:
 	# Verify that 'google unit test' library is installed.  If not,
 	# get it and install it
-	SConscript(src_dir + '/extlibs/gtest/SConscript')
+	SConscript('#extlibs/gtest/SConscript')
 
 	# Verify that 'hippomocks' mocking code is installed.  If not,
 	# get it and install it
-	SConscript(src_dir + '/extlibs/hippomocks.scons')
+	SConscript('#extlibs/hippomocks.scons')
 
     # Build Common unit tests
 	SConscript('c_common/oic_string/test/SConscript')
 	SConscript('c_common/oic_malloc/test/SConscript')
 	SConscript('c_common/oic_time/test/SConscript')
+	SConscript('c_common/ocrandom/test/SConscript')
 
 	# Build C unit tests
 	SConscript('csdk/stack/test/SConscript')
-	SConscript('csdk/ocrandom/test/SConscript')
 
 	SConscript('csdk/connectivity/test/SConscript')
 
 	# Build Security Resource Manager unit tests
-	SConscript('csdk/security/unittest/SConscript')
+	if env.get('SECURED') == '1':
+		SConscript('csdk/security/unittest/SConscript')
 
 	# Build C++ unit tests
 	SConscript('unittests/SConscript')
@@ -60,13 +61,31 @@ if target_os == 'linux':
 		SConscript('csdk/security/provisioning/unittest/SConscript')
 		SConscript('provisioning/unittests/SConscript')
 
-elif target_os == 'darwin':
+elif target_os == 'windows' and env.get('TEST') == '1':
 	# Verify that 'google unit test' library is installed.  If not,
 	# get it and install it
-	SConscript(src_dir + '/extlibs/gtest/SConscript')
+	SConscript('#extlibs/gtest/SConscript')
+
+	# Build Common unit tests
+	SConscript('c_common/windows/test/SConscript')
 
 	# Build C stack's unit tests.
 	SConscript('csdk/stack/test/SConscript')
 	SConscript('csdk/connectivity/test/SConscript')
 
+	# Build Security Resource Manager unit tests
+	if env.get('SECURED') == '1':
+		SConscript('csdk/security/unittest/SConscript')
+
+	# Build Provisioning API unit test
+	if env.get('SECURED') == '1':
+		SConscript('csdk/security/provisioning/unittest/SConscript')
+
+elif target_os in ['darwin', 'msys_nt']:
+	# Verify that 'google unit test' library is installed.  If not,
+	# get it and install it
+	SConscript('#extlibs/gtest/SConscript')
 
+	# Build C stack's unit tests.
+	SConscript('csdk/stack/test/SConscript')
+	SConscript('csdk/connectivity/test/SConscript')