1 --- a/plugins/SConscript
2 +++ b/plugins/SConscript
3 @@ -35,7 +35,7 @@ if target_os not in ['android', 'arduino
5 SConscript(os.path.join('src', 'SConscript'))
7 - SConscript(os.path.join('unittests', 'SConscript'))
8 +# SConscript(os.path.join('unittests', 'SConscript'))
10 if build_sample == 'ON':
11 if target_os in ['linux']:
12 --- a/resource/SConscript
13 +++ b/resource/SConscript
14 @@ -78,7 +78,7 @@ if target_os in ['linux', 'windows']:
15 SConscript('csdk/stack/samples/linux/secure/SConscript')
17 # Build C/C++ unit tests
18 - SConscript('unit_tests.scons')
19 + # SConscript('unit_tests.scons')
21 elif target_os == 'darwin':
22 env.Command('../../out/darwin/iotivity-csdk.framework',None,src_dir + '/tools/darwin/mkfwk_osx.sh')
23 --- a/resource/csdk/resource-directory/SConscript
24 +++ b/resource/csdk/resource-directory/SConscript
25 @@ -114,8 +114,3 @@ if 'SERVER' in rd_mode:
26 if target_os in ['linux']:
27 SConscript('samples/SConscript')
29 -######################################################################
30 -# Build UnitTests of the Resource Directory
31 -################################################ ######################
32 -if target_os in ['linux']:
33 - SConscript('unittests/SConscript')
34 --- a/service/coap-http-proxy/SConscript
35 +++ b/service/coap-http-proxy/SConscript
36 @@ -84,6 +84,3 @@ local_env.UserInstallTargetHeader('inclu
37 ######################################################################
38 if target_os in ['linux', 'tizen']:
39 SConscript('samples/SConscript')
41 -if target_os in ['linux']:
42 - SConscript('unittests/SConscript')
43 --- a/service/easy-setup/enrollee/SConscript
44 +++ b/service/easy-setup/enrollee/SConscript
45 @@ -123,7 +123,3 @@ if target_os == 'arduino':
47 if target_os in ['linux']:
48 SConscript('../sampleapp/enrollee/linux/SConscript')
49 - #Build UnitTestcases for Enrollee
50 - if enrollee_env.get('SECURED') == '0':
51 - SConscript('../enrollee/unittests/SConscript')
53 --- a/service/easy-setup/mediator/richsdk/SConscript
54 +++ b/service/easy-setup/mediator/richsdk/SConscript
55 @@ -163,11 +163,3 @@ if target_os in ['linux']:
56 if target_os in ['android']:
57 SConscript('../../sampleapp/mediator/android/SConscript')
60 -######################################################################
61 -#Build UnitTestcases for Mediator[RichSDK]
62 -################################################ ######################
63 -if env.get('SECURED') == '0':
64 - if target_os == 'linux':
65 - SConscript('unittests/SConscript')
67 --- a/service/resource-container/SConscript
68 +++ b/service/resource-container/SConscript
69 @@ -223,12 +223,6 @@ else:
70 lib_env = conf2.Finish()
72 ######################################################################
73 -# build resource container unit tests
74 -######################################################################
75 -if target_os in ['linux']:
76 - SConscript('unittests/SConscript')
78 -######################################################################
79 # Build Container Sample
80 ######################################################################
81 if target_os not in ['ios']:
82 --- a/service/resource-encapsulation/SConscript
83 +++ b/service/resource-encapsulation/SConscript
84 @@ -121,14 +121,5 @@ resourceClient_env.UserInstallTargetHead
85 ######################################################################
86 SConscript('examples/SConscript')
88 -######################################################################
89 -# Build UnitTests Resource Client , resourceCache and resourceBroker and
91 -################################################ ######################
92 -if target_os in ['linux']:
93 - SConscript('unittests/SConscript')
94 - SConscript('src/resourceCache/unittests/SConscript')
95 - SConscript('src/resourceBroker/unittest/SConscript')
97 if target_os == 'android':
98 SConscript('android/SConscript')
99 --- a/service/resource-encapsulation/src/common/SConscript
100 +++ b/service/resource-encapsulation/src/common/SConscript
102 # rcs_common (primitiveResource and expiryTimer) build script
107 # SConscript file for Local PKI google tests
108 -gtest_env = SConscript('#extlibs/gtest/SConscript')
109 -lib_env = gtest_env.Clone()
110 +lib_env = env.Clone()
112 # Add third party libraries
113 SConscript('#service/third_party_libs.scons', exports = 'lib_env')
114 --- a/service/resource-encapsulation/src/serverBuilder/SConscript
115 +++ b/service/resource-encapsulation/src/serverBuilder/SConscript
118 # rcs_server (Server Builder) project build script
123 # SConscript file for Local PKI google tests
124 -gtest_env = SConscript('#extlibs/gtest/SConscript')
125 -lib_env = gtest_env.Clone()
126 +lib_env = env.Clone()
128 # Add third party libraries
129 SConscript('#service/third_party_libs.scons', exports = 'lib_env')
130 --- a/service/scene-manager/SConscript
131 +++ b/service/scene-manager/SConscript
132 @@ -100,9 +100,5 @@ scenemanager_env.UserInstallTargetHeader
133 scenemanager_env.UserInstallTargetHeader('include/RemoteScene.h', 'service/scene-manager', 'RemoteScene.h')
134 scenemanager_env.UserInstallTargetHeader('include/RemoteSceneAction.h', 'service/scene-manager', 'RemoteSceneAction.h')
136 -# Go to build Unit test
137 -if target_os in ['linux']:
138 - SConscript('unittests/SConscript')
140 # Go to build sample apps
141 SConscript('sampleapp/SConscript')