Merge branch 'main' into msvc-runtime

awslabs · Aug 31, 2023 · 5e8b220 · 5e8b220
2 parents 01abb60 + e627dac
commit 5e8b220
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cmake/AwsTestHarness.cmake b/cmake/AwsTestHarness.cmake
@@ -11,8 +11,8 @@ define_property(GLOBAL PROPERTY AWS_TEST_CASES BRIEF_DOCS "Test Cases" FULL_DOCS
 set(AWS_TEST_CASES "" CACHE INTERNAL "Test cases valid for this configuration")
 
 # The return value for the skipped test cases. Refer to the return code defined in aws_test_harness.h:
-# #define SKIP (1)
-set(SKIP_RETURN_CODE_VALUE 1)
+# #define SKIP (103)
+set(SKIP_RETURN_CODE_VALUE 103)
 
 # Registers a test case by name (the first argument to the AWS_TEST_CASE macro in aws_test_harness.h)
 macro(add_test_case name)

diff --git a/include/aws/testing/aws_test_harness.h b/include/aws/testing/aws_test_harness.h
@@ -75,9 +75,11 @@ static int total_skip;
 
 #define SUCCESS (0)
 #define FAILURE (-1)
-/* The skip code returned to ctest to indicate the test is skipped. Refer to cmake doc:
- * https://cmake.org/cmake/help/latest/prop_test/SKIP_RETURN_CODE.html */
-#define SKIP (1)
+/* The exit code returned to ctest to indicate the test is skipped. Refer to cmake doc:
+ * https://cmake.org/cmake/help/latest/prop_test/SKIP_RETURN_CODE.html
+ * The value has no special meaning, it's just an arbitrary exit code reducing the chance of clashing with exit codes
+ * that may be returned from various tools (e.g. sanitizer). */
+#define SKIP (103)
 
 #define POSTSKIP_INTERNAL()                                                                                            \
     do {                                                                                                               \