[asan] Since r280945 fixed the OS X abort() problem, merge scariness_score_test.cc and make it a general test.

[filcab]

Summary

Merges back both scariness_score_test.cc files, since the Linux-specific version shouldn't be needed any more.

[vitalybuka]

LGTM

compiler-rt/trunk/test/asan/TestCases/Linux/scariness_score_test.cc

-// Test how we produce the scariness score.
-// Linux-specific variant which tests abort() calls. On OS X the process
-// disappears before being able to print the scariness.
-
-// RUN: %clangxx_asan -O0 %s -o %t
-// RUN: export %env_asan_opts=detect_stack_use_after_return=1:handle_abort=1:print_scariness=1
-// RUN: not %run %t 2>&1 | FileCheck %s
-// REQUIRES: shell
-#include <stdlib.h>
-
-int main(int argc, char **argv) {
-  abort();
-  // CHECK: SCARINESS: 10 (signal)
-}

compiler-rt/trunk/test/asan/TestCases/scariness_score_test.cc

 // RUN: not %run %t 19 2>&1 | FileCheck %s --check-prefix=CHECK19
 // RUN: not %run %t 20 2>&1 | FileCheck %s --check-prefix=CHECK20
 // RUN: not %run %t 21 2>&1 | FileCheck %s --check-prefix=CHECK21
 // RUN: not %run %t 22 2>&1 | FileCheck %s --check-prefix=CHECK22
 // RUN: not %run %t 23 2>&1 | FileCheck %s --check-prefix=CHECK23
 // RUN: not %run %t 24 2>&1 | FileCheck %s --check-prefix=CHECK24
 // RUN: not %run %t 25 2>&1 | FileCheck %s --check-prefix=CHECK25
 // RUN: not %run %t 26 2>&1 | FileCheck %s --check-prefix=CHECK26
+// RUN: not %run %t 27 2>&1 | FileCheck %s --check-prefix=CHECK27
 // Parts of the test are too platform-specific:
 // REQUIRES: x86_64-target-arch
 // REQUIRES: shell
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <sanitizer/asan_interface.h>
switch (kind) {
     case 19: *zero_ptr = 0; break;
     case 20: *wild_addr = 0; break;
     case 21: zero = *wild_addr; break;
     case 22: ((void (*)(void))wild_addr)(); break;
     case 23: delete (new int[10]); break;
     case 24: free((char*)malloc(100) + 10); break;
     case 25: memcpy(arr, arr+10, 20);  break;
     case 26: UseAfterPoison(); break;
+    case 27: abort();
     // CHECK1: SCARINESS: 12 (1-byte-read-heap-buffer-overflow)
     // CHECK2: SCARINESS: 17 (4-byte-read-heap-buffer-overflow)
     // CHECK3: SCARINESS: 33 (2-byte-write-heap-buffer-overflow)
     // CHECK4: SCARINESS: 52 (8-byte-write-heap-buffer-overflow-far-from-bounds)
     // CHECK5: SCARINESS: 55 (multi-byte-write-heap-buffer-overflow-far-from-bounds)
     // CHECK6: SCARINESS: 40 (1-byte-read-heap-use-after-free)
     // CHECK7: SCARINESS: 46 (4-byte-write-heap-use-after-free)
     // CHECK8: SCARINESS: 51 (8-byte-read-heap-use-after-free)
switch (kind) {
     // CHECK19: SCARINESS: 10 (null-deref)
     // CHECK20: SCARINESS: 30 (wild-addr-write)
     // CHECK21: SCARINESS: 20 (wild-addr-read)
     // CHECK22: SCARINESS: 60 (wild-jump)
     // CHECK23: SCARINESS: 10 (alloc-dealloc-mismatch)
     // CHECK24: SCARINESS: 40 (bad-free)
     // CHECK25: SCARINESS: 10 (memcpy-param-overlap)
     // CHECK26: SCARINESS: 27 (4-byte-read-use-after-poison)
+    // CHECK27: SCARINESS: 10 (signal)
   }
 }