Split the integration test cases into asan and non asan.

syzygy/integration_tests/integration_tests_dll.h

   // Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
 // This file declares the entry point for the different end to end
 // instrumentation tests.
 #ifndef SYZYGY_INTEGRATION_TESTS_INTEGRATION_TESTS_DLL_H_
 #define SYZYGY_INTEGRATION_TESTS_INTEGRATION_TESTS_DLL_H_
 
 #include <stdint.h>
 
 namespace testing {
 
-// This macro declares the tests ids and the function that they're associated
-// with.
-#define END_TO_END_TEST_ID_TABLE(decl) \
-    decl(kArrayComputation1, testing::ArrayComputation1)  \
-    decl(kArrayComputation2, testing::ArrayComputation2)  \
+// This macro declares the SyzyAsan tests ids and the function that they're
+// associated with.
+#define END_TO_END_ASAN_TESTS(decl)  \
     decl(kAsanRead8BufferOverflow, testing::AsanReadBufferOverflow<int8_t>)  \
     decl(kAsanRead16BufferOverflow, testing::AsanReadBufferOverflow<int16_t>)  \
     decl(kAsanRead32BufferOverflow, testing::AsanReadBufferOverflow<int32_t>)  \
     decl(kAsanRead64BufferOverflow, testing::AsanReadBufferOverflow<double>)  \
     decl(kAsanRead8BufferUnderflow, testing::AsanReadBufferUnderflow<int8_t>)  \
     decl(kAsanRead16BufferUnderflow,  \
          testing::AsanReadBufferUnderflow<int16_t>)  \
     decl(kAsanRead32BufferUnderflow,  \
          testing::AsanReadBufferUnderflow<int32_t>)  \
     decl(kAsanRead64BufferUnderflow,  \
@@ skipping 104 matching lines @@
     decl(kAsanStrncatDstOverflow, testing::AsanStrncatDstOverflow)  \
     decl(kAsanStrncatDstUnderflow, testing::AsanStrncatDstUnderflow)  \
     decl(kAsanStrncatDstUseAfterFree, testing::AsanStrncatDstUseAfterFree)  \
     decl(kAsanReadFileOverflow, testing::AsanReadFileOverflow)  \
     decl(kAsanReadFileUseAfterFree, testing::AsanReadFileUseAfterFree)  \
     decl(kAsanWriteFileOverflow, testing::AsanWriteFileOverflow)  \
     decl(kAsanWriteFileUseAfterFree, testing::AsanWriteFileUseAfterFree)  \
     decl(kAsanCorruptBlock, testing::AsanCorruptBlock)  \
     decl(kAsanCorruptBlockInQuarantine,  \
          testing::AsanCorruptBlockInQuarantine)  \
-    decl(kBBEntryCallOnce, BBEntryCallOnce)  \
-    decl(kBBEntryCallTree, BBEntryCallTree)  \
-    decl(kBBEntryCallRecursive, BBEntryCallRecursive)  \
-    decl(kCoverage1, testing::coverage_func1)  \
-    decl(kCoverage2, testing::coverage_func2)  \
-    decl(kCoverage3, testing::coverage_func3)  \
-    decl(kProfileCallExport, testing::CallExportedFunction)  \
-    decl(kProfileGetMyRVA, testing::GetMyRVA)  \
     decl(kAsanInvalidAccessWithCorruptAllocatedBlockHeader,  \
          testing::AsanInvalidAccessWithCorruptAllocatedBlockHeader)  \
     decl(kAsanInvalidAccessWithCorruptAllocatedBlockTrailer,  \
          testing::AsanInvalidAccessWithCorruptAllocatedBlockTrailer)  \
     decl(kAsanInvalidAccessWithCorruptFreedBlock,  \
          testing::AsanInvalidAccessWithCorruptFreedBlock)  \
     decl(kAsanReadLargeAllocationTrailerBeforeFree,  \
          testing::AsanReadLargeAllocationTrailerBeforeFree)  \
     decl(kAsanReadLargeAllocationBodyAfterFree,  \
          testing::AsanReadLargeAllocationBodyAfterFree)  \
     decl(kAsanReadPageAllocationTrailerBeforeFreeAllocation,  \
          testing::AsanReadPageAllocationTrailerBeforeFree)  \
     decl(kAsanWritePageAllocationBodyAfterFree,  \
          testing::AsanWritePageAllocationBodyAfterFree)  \
     decl(kAsanMemcmpAccessViolation, testing::AsanMemcmpAccessViolation)  \
     decl(kAsanCorruptBlockWithPageProtections,  \
          testing::AsanCorruptBlockWithPageProtections) \
     decl(kAsanNearNullptrAccessHeapCorruptionInstrumented, \
          testing::AsanNearNullptrAccessHeapCorruptionInstrumented) \
     decl(kAsanNearNullptrAccessHeapCorruptionUninstrumented, \
          testing::AsanNearNullptrAccessHeapCorruptionUninstrumented) \
     decl(kAsanNearNullptrAccessNoHeapCorruptionInstrumented, \
          testing::AsanNearNullptrAccessNoHeapCorruptionInstrumented) \
     decl(kAsanNearNullptrAccessNoHeapCorruptionUninstrumented, \
          testing::AsanNearNullptrAccessNoHeapCorruptionUninstrumented) \
     decl(kAsanNullptrAccessNoHeapCorruptionUninstrumented, \
          testing::AsanNullptrAccessNoHeapCorruptionUninstrumented) \
     decl(kAsanDeferredFreeTLS, testing::AsanDeferredFreeTLS)
 
+// This macro declares the non SyzyAsan tests ids and the function that they're
+// associated with.
+#define END_TO_END_NON_ASAN_TESTS(decl)  \
+    decl(kArrayComputation1, testing::ArrayComputation1)  \
+    decl(kArrayComputation2, testing::ArrayComputation2)  \
+    decl(kBBEntryCallOnce, BBEntryCallOnce)  \
+    decl(kBBEntryCallTree, BBEntryCallTree)  \
+    decl(kBBEntryCallRecursive, BBEntryCallRecursive)  \
+    decl(kCoverage1, testing::coverage_func1)  \
+    decl(kCoverage2, testing::coverage_func2)  \
+    decl(kCoverage3, testing::coverage_func3)  \
+    decl(kProfileCallExport, testing::CallExportedFunction)  \
+    decl(kProfileGetMyRVA, testing::GetMyRVA)
+
+// Only run the Asan tests for the Clang builds

[Sébastien Marchand, 2017/07/06 19:05:40]

Missing period :)

+#ifdef __clang__
+#define END_TO_END_TEST_ID_TABLE(decl) END_TO_END_ASAN_TESTS(decl)
+#else
+#define END_TO_END_TEST_ID_TABLE(decl)  \
+    END_TO_END_NON_ASAN_TESTS(decl) END_TO_END_ASAN_TESTS(decl)
+#endif // __clang__
+
 // This enumeration contains an unique id for each end to end test. It is used
 // to perform an indirect call through the DLL entry point 'EndToEndTest'.
 enum EndToEndTestId {
 #define DECLARE_END_TO_END_ENUM(enum_name, function_to_call) enum_name,
   END_TO_END_TEST_ID_TABLE(DECLARE_END_TO_END_ENUM)
 #undef DECLARE_END_TO_END_ENUM
 };
 
 }  // namespace testing
 
 #endif  // SYZYGY_INTEGRATION_TESTS_INTEGRATION_TESTS_DLL_H_