Merge branch '1.3-rel' 99/19199/1
authorKevin Kane <kkane@microsoft.com>
Fri, 21 Apr 2017 16:43:20 +0000 (09:43 -0700)
committerKevin Kane <kkane@microsoft.com>
Fri, 21 Apr 2017 16:43:20 +0000 (09:43 -0700)
Change-Id: I890b2085d970f1cdf7d8749f72af628a97646976
Signed-off-by: Kevin Kane <kkane@microsoft.com>
1  2 
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/src/pstatresource.c
resource/csdk/stack/src/ocstack.c
resource/unit_tests.scons

Simple merge
@@@ -44,12 -44,12 +44,11 @@@ if target_os in ['linux', 'windows', 'd
          SConscript('unittests/SConscript', 'test_env')
  
          # Build Security Resource Manager and Provisioning API unit test
-         # TODO: Enable provisioning and associated unit tests for Windows
-         if (env.get('SECURED') == '1') and (target_os != 'windows'):
+         if env.get('SECURED') == '1':
              SConscript('provisioning/unittests/SConscript', 'test_env')
  
 -        if target_os in ['windows']:
 -            # Build IPCA unit tests
 -            SConscript('IPCA/unittests/SConscript', 'test_env')
 +        # Build IPCA unit tests
 +        SConscript('IPCA/unittests/SConscript', 'test_env')
  
      # Build C unit tests
      SConscript('csdk/unittests/SConscript', 'test_env')