You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

153 lines
5.9 KiB

  1. --- a/resource/SConscript
  2. +++ b/resource/SConscript
  3. @@ -75,7 +75,7 @@ if target_os == 'linux':
  4. SConscript('csdk/stack/samples/linux/secure/SConscript')
  5. # Build C/C++ unit tests
  6. - SConscript('unit_tests.scons')
  7. + # SConscript('unit_tests.scons')
  8. elif target_os == 'darwin':
  9. env.Command('../../out/darwin/iotivity-csdk.framework',None,src_dir + '/tools/darwin/mkfwk_osx.sh')
  10. --- a/resource/csdk/security/provisioning/ck_manager/SConscript
  11. +++ b/resource/csdk/security/provisioning/ck_manager/SConscript
  12. @@ -47,4 +47,4 @@ x509_env.AppendUnique(LIBS = ['Base64'])
  13. x509_env.AppendUnique(LIBS = ['Json'])
  14. SConscript('sample/SConscript')
  15. -SConscript('unittest/SConscript')
  16. +# SConscript('unittest/SConscript')
  17. --- a/service/resource-encapsulation/SConscript
  18. +++ b/service/resource-encapsulation/SConscript
  19. @@ -113,10 +113,10 @@ SConscript('examples/SConscript')
  20. # Build UnitTests Resource Client , resourceCache and resourceBroker and
  21. # DiscoveryManager
  22. ################################################ ######################
  23. -if target_os == 'linux':
  24. - SConscript('unittests/SConscript')
  25. - SConscript('src/resourceCache/unittests/SConscript')
  26. - SConscript('src/resourceBroker/unittest/SConscript')
  27. +# if target_os == 'linux':
  28. +# SConscript('unittests/SConscript')
  29. +# SConscript('src/resourceCache/unittests/SConscript')
  30. +# SConscript('src/resourceBroker/unittest/SConscript')
  31. if target_os == 'android':
  32. SConscript('android/SConscript')
  33. \ No newline at end of file
  34. --- a/service/things-manager/SConscript
  35. +++ b/service/things-manager/SConscript
  36. @@ -75,6 +75,6 @@ SConscript('sampleapp/SConscript')
  37. ######################################################################
  38. # Build UnitTests Things Manager
  39. ################################################ ######################
  40. -if target_os == 'linux':
  41. - SConscript('unittests/SConscript')
  42. +# if target_os == 'linux':
  43. +# SConscript('unittests/SConscript')
  44. --- a/service/resource-hosting/SConscript
  45. +++ b/service/resource-hosting/SConscript
  46. @@ -94,8 +94,8 @@ resourcehosting_env.UserInstallTargetHea
  47. 'service/resource-hosting', 'Hosting.h')
  48. # Go to build Unit test
  49. -if target_os == 'linux':
  50. - SConscript('unittest/SConscript')
  51. +# if target_os == 'linux':
  52. +# SConscript('unittest/SConscript')
  53. # Go to build sample apps
  54. SConscript('SampleApp/SConscript')
  55. --- a/service/easy-setup/mediator/csdk/SConscript
  56. +++ b/service/easy-setup/mediator/csdk/SConscript
  57. @@ -124,8 +124,8 @@ if target_os == 'linux':
  58. ######################################################################
  59. #Build UnitTestcases for Mediator[CSDK]
  60. ################################################ ######################
  61. -if target_os == 'linux':
  62. - SConscript('unittests/SConscript')
  63. +# if target_os == 'linux':
  64. +# SConscript('unittests/SConscript')
  65. --- a/service/easy-setup/mediator/richsdk/SConscript
  66. +++ b/service/easy-setup/mediator/richsdk/SConscript
  67. @@ -138,6 +138,6 @@ if target_os == 'linux':
  68. ######################################################################
  69. #Build UnitTestcases for Mediator[RichSDK]
  70. ################################################ ######################
  71. -if target_os == 'linux':
  72. - SConscript('unittests/SConscript')
  73. +# if target_os == 'linux':
  74. +# SConscript('unittests/SConscript')
  75. --- a/service/resource-container/SConscript
  76. +++ b/service/resource-container/SConscript
  77. @@ -209,8 +209,8 @@ lib_env = conf2.Finish()
  78. ######################################################################
  79. # build resource container unit tests
  80. ######################################################################
  81. -if target_os == 'linux':
  82. - SConscript('unittests/SConscript')
  83. +# if target_os == 'linux':
  84. +# SConscript('unittests/SConscript')
  85. ######################################################################
  86. # Build Container Sample
  87. --- a/plugins/SConscript
  88. +++ b/plugins/SConscript
  89. @@ -35,7 +35,7 @@ if target_os not in ['android', 'arduino
  90. SConscript(os.path.join('src', 'SConscript'))
  91. - SConscript(os.path.join('unittests', 'SConscript'))
  92. +# SConscript(os.path.join('unittests', 'SConscript'))
  93. if build_sample == 'ON':
  94. if target_os in ['linux']:
  95. --- a/service/scene-manager/SConscript
  96. +++ b/service/scene-manager/SConscript
  97. @@ -101,8 +101,8 @@ scenemanager_env.UserInstallTargetHeader
  98. scenemanager_env.UserInstallTargetHeader('include/RemoteSceneAction.h', 'service/scene-manager', 'RemoteSceneAction.h')
  99. # Go to build Unit test
  100. -if target_os == 'linux':
  101. - SConscript('unittests/SConscript')
  102. +# if target_os == 'linux':
  103. +# SConscript('unittests/SConscript')
  104. # Go to build sample apps
  105. -SConscript('sampleapp/SConscript')
  106. +# SConscript('sampleapp/SConscript')
  107. --- a/service/resource-encapsulation/src/common/SConscript
  108. +++ b/service/resource-encapsulation/src/common/SConscript
  109. @@ -122,9 +122,9 @@ if target_os == 'linux':
  110. 'expiryTimer/unittests/ExpiryTimerTest.cpp'
  111. ]
  112. - rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
  113. - Alias("rcs_common_test", rcs_common_test)
  114. - env.AppendTarget('rcs_common_test')
  115. +# rcs_common_test = rcs_common_test_env.Program('rcs_common_test', rcs_common_test_src)
  116. +# Alias("rcs_common_test", rcs_common_test)
  117. +# env.AppendTarget('rcs_common_test')
  118. if env.get('TEST') == '1':
  119. from tools.scons.RunTest import *
  120. --- a/service/resource-encapsulation/src/serverBuilder/SConscript
  121. +++ b/service/resource-encapsulation/src/serverBuilder/SConscript
  122. @@ -110,9 +110,9 @@ if target_os == 'linux':
  123. server_builder_test_src = env.Glob('unittests/*.cpp')
  124. - server_builder_test = server_builder_test_env.Program('rcs_server_test', server_builder_test_src)
  125. - Alias("rcs_server_test", server_builder_test)
  126. - env.AppendTarget('rcs_server_test')
  127. +# server_builder_test = server_builder_test_env.Program('rcs_server_test', server_builder_test_src)
  128. +# Alias("rcs_server_test", server_builder_test)
  129. +# env.AppendTarget('rcs_server_test')
  130. if env.get('TEST') == '1':
  131. from tools.scons.RunTest import *