From 2beaab358c29a4f0cdd422d624b269fa7f4c9662 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 8 Jan 2016 17:26:03 +0000 Subject: [PATCH] Make ubsan suppression test pass on Windows. llvm-svn: 257183 --- .../ubsan/TestCases/Integer/suppressions.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/compiler-rt/test/ubsan/TestCases/Integer/suppressions.cpp b/compiler-rt/test/ubsan/TestCases/Integer/suppressions.cpp index e2f632d0725c..e6ae626db3d7 100644 --- a/compiler-rt/test/ubsan/TestCases/Integer/suppressions.cpp +++ b/compiler-rt/test/ubsan/TestCases/Integer/suppressions.cpp @@ -1,31 +1,23 @@ -// XFAIL: win32 -// On Windows, %t starts with c:\. lit's ShLexer helpfully strips the -// quotes in the suppressions="%t..." lines below, so the UBSAN_OPTIONS -// env var that ubsan effectively sees is halt_on_error=1:suppressions=c:\... -// without any quotes. Since : is ubsan's UBSAN_OPTIONS separator, this -// confuses sanitizer_flag_parser. -// FIXME: Figure out how to make this test go on Windows. - // RUN: %clangxx -fsanitize=integer -g0 %s -o %t // Fails without any suppression. // RUN: %env_ubsan_opts=halt_on_error=1 not %run %t 2>&1 | FileCheck %s // RUN: echo "signed-integer-overflow:%t" > %t.wrong-supp -// RUN: %env_ubsan_opts=halt_on_error=1:suppressions="%t.wrong-supp" not %run %t 2>&1 | FileCheck %s +// RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.wrong-supp"' not %run %t 2>&1 | FileCheck %s // RUN: echo "unsigned-integer-overflow:do_overflow" > %t.func-supp -// RUN: %env_ubsan_opts=halt_on_error=1:suppressions="%t.func-supp" %run %t +// RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.func-supp"' %run %t // RUN: echo "unsigned-integer-overflow:%t" > %t.module-supp -// RUN: %env_ubsan_opts=halt_on_error=1:suppressions="%t.module-supp" %run %t +// RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.module-supp"' %run %t // Note: file-level suppressions should work even without debug info. // RUN: echo "unsigned-integer-overflow:%s" > %t.file-supp -// RUN: %env_ubsan_opts=halt_on_error=1:suppressions="%t.file-supp" %run %t +// RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.file-supp"' %run %t // Suppressions don't work for unrecoverable kinds. // RUN: %clangxx -fsanitize=integer -fno-sanitize-recover=integer %s -o %t-norecover -// RUN: %env_ubsan_opts=halt_on_error=1:suppressions="%t.module-supp" not %run %t-norecover 2>&1 | FileCheck %s +// RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.module-supp"' not %run %t-norecover 2>&1 | FileCheck %s #include