Split the integration test cases into asan and non asan.

syzygy/integration_tests/integration_tests_dll.h

Index: syzygy/integration_tests/integration_tests_dll.h
diff --git a/syzygy/integration_tests/integration_tests_dll.h b/syzygy/integration_tests/integration_tests_dll.h
index c8412a76f723b36ac5c90951b05c315a9d4b079d..6ec83cb2365501f03f3c99859ad7832c88a2fd43 100644
--- a/syzygy/integration_tests/integration_tests_dll.h
+++ b/syzygy/integration_tests/integration_tests_dll.h
@@ -21,11 +21,9 @@
 
 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 SygyAsan tests ids and the function that they're

[Sébastien Marchand, 2017/07/06 15:33:42]

SyzyAsan, with a Z.

+// 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>)  \
@@ -150,14 +148,6 @@ namespace testing {
     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,  \
@@ -187,6 +177,29 @@ namespace testing {
          testing::AsanNullptrAccessNoHeapCorruptionUninstrumented) \
     decl(kAsanDeferredFreeTLS, testing::AsanDeferredFreeTLS)
 

[Sébastien Marchand, 2017/07/06 15:33:42]

Remove the extra BLs.

+
+
+// This macro declares the non SygyAsan 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)
+
+// For clang-cl run only the asan tests.

[Sébastien Marchand, 2017/07/06 15:33:42]

"Only run the Asan tests for the Clang builds"?

+#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)

[Sébastien Marchand, 2017/07/06 15:33:42]

This is > 80 chars.

+#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 {
@@ -194,7 +207,6 @@ enum EndToEndTestId {
   END_TO_END_TEST_ID_TABLE(DECLARE_END_TO_END_ENUM)
 #undef DECLARE_END_TO_END_ENUM
 };

[Sébastien Marchand, 2017/07/06 15:33:42]

Re-add this BL.

-
 }  // namespace testing
 
 #endif  // SYZYGY_INTEGRATION_TESTS_INTEGRATION_TESTS_DLL_H_