X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Fprovisioning%2Funittest%2FSConscript;h=fbdb5fd8c422cc2c2d35f358df771a3be72b29e4;hb=385deffade480ba9f9179b540c766231b864a30c;hp=838bf309d1f498adf36b424a163c926b1c212646;hpb=78d5cb6296c178dea7e6e9c10abf3ccd72002c1d;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript
index 838bf30..fbdb5fd 100644
--- a/resource/csdk/security/provisioning/unittest/SConscript
+++ b/resource/csdk/security/provisioning/unittest/SConscript
@@ -17,75 +17,107 @@
 # // limitations under the License.
 # //
 # //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#
 
-Import('env')
 import os
 import os.path
-sptest_env = env.Clone()
+from tools.scons.RunTest import run_test
 
+Import('test_env')
+
+# SConscript file for Local PKI google tests
+sptest_env = test_env.Clone()
 src_dir = sptest_env.get('SRC_DIR')
+target_os = sptest_env.get('TARGET_OS')
+rd_mode = sptest_env.get('RD_MODE')
 
 ######################################################################
 # Build flags
 ######################################################################
+with_upstream_libcoap = sptest_env.get('WITH_UPSTREAM_LIBCOAP')
+if with_upstream_libcoap == '1':
+	sptest_env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+	sptest_env.AppendUnique(CPPPATH = ['../../../connectivity/lib/libcoap-4.1.1/include'])
+
 sptest_env.PrependUnique(CPPPATH = [
-		'../../../connectivity/inc',
-		'../../../connectivity/api',
+		'../include',
 		'../../include',
-		'../../../../../extlibs/tinydtls',
 		'../include/internal',
-		'../include/oxm',
+		'../../../include',
+		'../../../ocrandom/include',
 		'../../../logger/include',
 		'../../../stack/include',
+		'../../../security/include',
+		'../../../security/include/internal',
+		'../../../security/provisioning/include/internal',
 		'../../../../oc_logger/include',
-		'../../../../../extlibs/gtest/gtest-1.7.0/include',
-		'../include',
-		'../include/internal'
+		'../include/oxm',
+		'../../../../../extlibs/base64',
+		'../../../connectivity/inc',
+		'../../../connectivity/inc/pkix',
+		'../../../connectivity/common/inc',
+		'../../../connectivity/api'
 		])
-sptest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
-sptest_env.AppendUnique(LIBS = ['-lpthread','-ldl'])
-sptest_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-sptest_env.AppendUnique(LIBPATH = [src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs'])
-sptest_env.PrependUnique(LIBS = [   'ocpmapi',
+
+sptest_env.PrependUnique(LIBS = [   'ocpmapi_internal',
+                                    'oc',
+                                    'octbstack_internal',
                                     'ocsrm',
-                                    'octbstack',
-                                    'oc_logger',
-                                    'connectivity_abstraction',
-                                    'coap',
-                                    'gtest',
-                                    'gtest_main'])
-
-if env.get('SECURED') == '1':
-    sptest_env.AppendUnique(LIBS = ['tinydtls'])
-if env.get('DTLS_WITH_X509') == '1':
-	sptest_env.AppendUnique(LIBS = ['CKManager'])
-	sptest_env.AppendUnique(LIBS = ['asn1'])
-
-if not env.get('RELEASE'):
+                                    'routingmanager',
+                                    'oc_logger_internal',
+                                    'connectivity_abstraction_internal',
+                                    'coap'])
+
+if sptest_env.get('SECURED') == '1':
+    sptest_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
+
+if not sptest_env.get('RELEASE'):
 	sptest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
+if sptest_env.get('MULTIPLE_OWNER') == '1':
+	sptest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
+
+sptest_env.AppendUnique(LIBS = ['octbstack_internal'])
+
+if target_os in ['msys_nt', 'windows']:
+    sptest_env.AppendUnique(LIBS = ['sqlite3'])
+else:
+    if target_os in ['linux', 'tizen']:
+        sptest_env.ParseConfig('pkg-config --cflags --libs sqlite3 gobject-2.0 gio-2.0 glib-2.0')
+
 ######################################################################
 # Source files and Targets
 ######################################################################
-unittest = sptest_env.Program('unittest', ['pmutilitytest.cpp', 'otmunittest.cpp',
-                                           'secureresourceprovider.cpp',
-                                           'provisioningdatabasemanager.cpp',
-                                           'ocprovisioningmanager.cpp' ])
+unittest_src = ['pmutilitytest.cpp',
+                'secureresourceprovider.cpp',
+                'provisioningdatabasemanager.cpp',
+                'ocprovisioningmanager.cpp',
+                'credentialgeneratortest.cpp',
+                ]
+
+if target_os not in ['windows']:
+    unittest_src += [ 'otmunittest.cpp' ]
+
+unittest = sptest_env.Program('unittest', unittest_src)
+
+if target_os not in ['windows']:
+    sample_server1 = sptest_env.Program('sample_server1', ['sampleserver1.cpp'])
+    sample_server2 = sptest_env.Program('sample_server2', ['sampleserver2.cpp'])
+    Alias("test", [sample_server1, sample_server2])
 
 Alias("test", [unittest])
 
-env.AppendTarget('test')
-if env.get('TEST') == '1':
-	target_os = env.get('TARGET_OS')
-	if target_os == 'linux':
-		out_dir = env.get('BUILD_DIR')
-		result_dir = env.get('BUILD_DIR') + '/test_out/'
+sptest_env.AppendTarget('test')
+# TODO: fix test for all supported configurations
+if sptest_env.get('TEST') == '1' and sptest_env.get('SECURED') != '1':
+	if target_os in ['linux', 'windows']:
+		out_dir = sptest_env.get('BUILD_DIR')
+		result_dir = os.path.join(sptest_env.get('BUILD_DIR'), 'test_out') + os.sep
 		if not os.path.isdir(result_dir):
 			os.makedirs(result_dir)
 		sptest_env.AppendENVPath('GTEST_OUTPUT', ['xml:'+ result_dir])
 		sptest_env.AppendENVPath('LD_LIBRARY_PATH', [out_dir])
-		sptest_env.AppendENVPath('LD_LIBRARY_PATH', ['./extlibs/gtest/gtest-1.7.0/lib/.libs'])
-		ut = sptest_env.Command ('ut', None, out_dir + '/resource/csdk/security/unittest/unittest')
-		AlwaysBuild ('ut')
-
+		sptest_env.AppendENVPath('PATH', sptest_env.get('BUILD_DIR'))
+		run_test(sptest_env,
+				 'resource_csdk_security_provisioning_unittest.memcheck',
+				 'resource/csdk/security/provisioning/unittest/unittest')