Merge branch '1.3-rel' (e5418f06) 19/23419/6
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 28 Nov 2017 10:36:29 +0000 (11:36 +0100)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Thu, 30 Nov 2017 15:20:44 +0000 (16:20 +0100)
Relate-to: https://gerrit.iotivity.org/gerrit/#/c/23103/

Bug: https://jira.iotivity.org/browse/IOT-2453
Change-Id: I93f67455f3fa092223067620368e82c185c47641
Origin: https://gerrit.iotivity.org/gerrit/#/c/23419/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
1  2 
resource/csdk/connectivity/SConscript
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/security/src/certhelpers.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/stack/src/ocresource.c
resource/provisioning/unittests/SConscript
service/easy-setup/enrollee/src/resourcehandler.c

@@@ -15,10 -20,11 +20,11 @@@ print("MQ flag is %s" % with_mq
  targets_disallow_multitransport = ['arduino']
  
  if target_os in targets_disallow_multitransport:
-     if 'ALL' in transport or len(transport) != 1:
-         msg = "*** Error invalid option values: TARGET_TRANSPORT"
-         msg += "%s disallowed until testing can validate use of multiple transports on %s %d" % (
-             transport, target_os, len(transport))
+     if ('ALL' in transport) or (len(transport) != 1):
+         msg = '''
+ *** Error invalid option values: TARGET_TRANSPORT
+ %s disallowed until testing can validate use of multiple transports on %s %d
+ ''' % (transport, target_os, len(transport))
          Exit(msg)
  
 -SConscript('src/SConscript', exports = 'connectivity_env')
 +SConscript('src/SConscript', exports='connectivity_env')
Simple merge
@@@ -123,18 -121,18 +125,18 @@@ if provisiontests_env.get('TEST') == '1
      # Workaround for IOT-2038: don't run this test on Windows yet, because Jenkins times out.
      if target_os in ['linux']:
          out_dir = provisiontests_env.get('BUILD_DIR')
 -        result_dir = os.path.join(provisiontests_env.get('BUILD_DIR'), 'test_out') + os.sep
 +        result_dir = os.path.join(
 +            provisiontests_env.get('BUILD_DIR'), 'test_out') + os.sep
          if not os.path.isdir(result_dir):
              os.makedirs(result_dir)
 -        provisiontests_env.AppendENVPath('GTEST_OUTPUT', ['xml:'+ result_dir])
 +        provisiontests_env.AppendENVPath('GTEST_OUTPUT', ['xml:' + result_dir])
          provisiontests_env.AppendENVPath('LD_LIBRARY_PATH', [out_dir])
          run_test(provisiontests_env,
-                    'resource_provisioning_unittests_provisiontests.memcheck',
-                    'resource/provisioning/unittests/provisiontests',
-                     unittests)
+                  'resource_provisioning_unittests_provisiontests.memcheck',
+                  'resource/provisioning/unittests/provisiontests',
+                   unittests)
  
 -src_dir = provisiontests_env.get('SRC_DIR')
 -svr_db_src_dir = src_dir + '/resource/provisioning/examples/'
 -svr_db_build_dir = os.path.join(provisiontests_env.get('BUILD_DIR'), 'resource', 'provisioning', 'unittests')
 -provisiontests_env.Alias("install", provisiontests_env.Install( svr_db_build_dir,
 -                                svr_db_src_dir + 'oic_svr_db_client.json'))
 +src = File('#/resource/provisioning/examples/oic_svr_db_client.json')
 +dst = provisiontests_env.get('BUILD_DIR') + Dir('.').srcnode().path + "/" + src.name
 +i_n = provisiontests_env.Command(dst, src, Copy("$TARGET", "$SOURCE"))
 +provisiontests_env.Alias("install", i_n)