Fix Check test to avoid output string mismatch

Differential Revision: http://reviews.llvm.org/D51354

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@342031 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Driver/print-multi-directory.c b/test/Driver/print-multi-directory.c
index a161543ce782d12126ff2ccc380fa25ea11b2d14..c98715d71e6e77a2d14dbd93be24107cb7c7b6c9 100644 (file)
--- a/test/Driver/print-multi-directory.c
+++ b/test/Driver/print-multi-directory.c
@@ -2,21 +2,19 @@
 // RUN:     -target i386-none-linux \
 // RUN:     -B%S/Inputs/multilib_64bit_linux_tree/usr \
 // RUN:     -print-multi-directory \
-// RUN:   | FileCheck --check-prefix=CHECK-X86-MULTILIBS %s
+// RUN:   | FileCheck --match-full-lines --check-prefix=CHECK-X86-MULTILIBS %s
 
 // CHECK-X86-MULTILIBS:      32
-// CHECK-X86-MULTILIBS-NOT:  x32
-// CHECK-X86-MULTILIBS-NOT:  .
+// CHECK-X86-MULTILIBS-NOT:  {{^.+$}}
 
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>/dev/null \
 // RUN:     -target i386-none-linux -m64 \
 // RUN:     -B%S/Inputs/multilib_64bit_linux_tree/usr \
 // RUN:     -print-multi-directory \
-// RUN:   | FileCheck --check-prefix=CHECK-X86_64-MULTILIBS %s
+// RUN:   | FileCheck --match-full-lines --check-prefix=CHECK-X86_64-MULTILIBS %s
 
 // CHECK-X86_64-MULTILIBS:      .
-// CHECK-X86_64-MULTILIBS-NOT:  x32
-// CHECK-X86_64-MULTILIBS-NOT:  32
+// CHECK-X86_64-MULTILIBS-NOT:  {{^.+$}}
 
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>/dev/null \
 // RUN:     -target arm-linux-androideabi21 \
@@ -24,7 +22,7 @@
 // RUN:     -B%S/Inputs/basic_android_ndk_tree \
 // RUN:     --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
 // RUN:     -print-multi-directory \
-// RUN:   | FileCheck  --check-prefix=CHECK-ARM-MULTILIBS %s
+// RUN:   | FileCheck --match-full-lines --check-prefix=CHECK-ARM-MULTILIBS %s
 
 // CHECK-ARM-MULTILIBS:      thumb
-// CHECK-ARM-MULTILIBS-NOT:  .
+// CHECK-ARM-MULTILIBS-NOT:  {{^.+$}}