From 8f41c3eb74619a82b1c41bba3e09467d0a65db0c Mon Sep 17 00:00:00 2001
From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Tue, 22 Jul 2014 12:25:51 +0000
Subject: [PATCH] [ASan] Simplify exception/longjmp tests even further

llvm-svn: 213646
---
 compiler-rt/test/asan/TestCases/longjmp.cc     | 8 +-------
 compiler-rt/test/asan/TestCases/throw_catch.cc | 3 ---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/compiler-rt/test/asan/TestCases/longjmp.cc b/compiler-rt/test/asan/TestCases/longjmp.cc
index 6a7ba72c852d..5472330683b4 100644
--- a/compiler-rt/test/asan/TestCases/longjmp.cc
+++ b/compiler-rt/test/asan/TestCases/longjmp.cc
@@ -2,14 +2,12 @@
 
 #include <assert.h>
 #include <setjmp.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <sanitizer/asan_interface.h>
 
 static jmp_buf buf;
 
-void TestLongJmp() {
+int main() {
   char x[32];
   fprintf(stderr, "\nTestLongJmp\n");
   fprintf(stderr, "Before: %p poisoned: %d\n", &x,
@@ -23,7 +21,3 @@ void TestLongJmp() {
   // https://code.google.com/p/address-sanitizer/issues/detail?id=258
   assert(!__asan_address_is_poisoned(x + 32));
 }
-
-int main(int argc, char **argv) {
-  TestLongJmp();
-}
diff --git a/compiler-rt/test/asan/TestCases/throw_catch.cc b/compiler-rt/test/asan/TestCases/throw_catch.cc
index ad7abf740e43..7e0d76d10836 100644
--- a/compiler-rt/test/asan/TestCases/throw_catch.cc
+++ b/compiler-rt/test/asan/TestCases/throw_catch.cc
@@ -4,10 +4,7 @@
 // XFAIL: win32
 
 #include <assert.h>
-#include <setjmp.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <sanitizer/asan_interface.h>
 
 __attribute__((noinline))
-- 
2.34.1