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..9eb24f478db23c8d9f890a5d88735cb889351fec 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 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>) \ |
@@ -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,28 @@ namespace testing { |
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 { |