IOT-1961: Fixing Windows c_common test build environment.

One test was missing the /W4 and /WX compiler options, because
it was using a default test environment variable.

Change-Id: I095d612e6778576384a4b78abf3a97b958e5f5ee
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18175
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>

diff --git a/resource/c_common/unittests/SConscript b/resource/c_common/unittests/SConscript
index 430f672..8cf52d0 100644 (file)
--- a/resource/c_common/unittests/SConscript
+++ b/resource/c_common/unittests/SConscript
@@ -36,4 +36,4 @@ SConscript('../oic_malloc/test/SConscript', exports = { 'test_env' : common_test
 SConscript('../oic_time/test/SConscript', exports = { 'test_env' : common_test_env})
 SConscript('../ocrandom/test/SConscript', exports = { 'test_env' : common_test_env})
 if target_os == 'windows':
-    SConscript('../windows/test/SConscript', 'test_env')
+    SConscript('../windows/test/SConscript', exports = { 'test_env' : common_test_env})

diff --git a/resource/c_common/windows/test/snprintf_test.cpp b/resource/c_common/windows/test/snprintf_test.cpp
index cce6276..5d39e5b 100644 (file)
--- a/resource/c_common/windows/test/snprintf_test.cpp
+++ b/resource/c_common/windows/test/snprintf_test.cpp
@@ -24,7 +24,7 @@
 void OutputBufferLargerThanNeeded(size_t outputBufferSize, size_t inputBufferSize, int callerLineNumber)
 {
     ASSERT_GT(outputBufferSize, inputBufferSize);
-    ASSERT_GT(inputBufferSize, 1);
+    ASSERT_GT(inputBufferSize, 1U);
 
     char *inputBuffer = new char[inputBufferSize];
     memset(inputBuffer, 'i', inputBufferSize - 1);
@@ -45,7 +45,7 @@ void OutputBufferLargerThanNeeded(size_t outputBufferSize, size_t inputBufferSiz
 void OutputBufferSmallerThanNeeded(size_t outputBufferSize, size_t inputBufferSize, int callerLineNumber)
 {
     ASSERT_GT(inputBufferSize, outputBufferSize);
-    ASSERT_GT(outputBufferSize, 1);
+    ASSERT_GT(outputBufferSize, 1U);
 
     char *inputBuffer = new char[inputBufferSize];
     memset(inputBuffer, 'i', inputBufferSize - 1);