001-no_unit_test.patch 5.2 KB

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