From 1fdd7db7fc0a9bd2fcdb838a75eb5987398bb7b2 Mon Sep 17 00:00:00 2001 From: Yaron Keren Date: Wed, 15 Jul 2015 10:45:25 +0000 Subject: [PATCH] Fix test to run under MSYS2 by disabling MSYS conversion of /C /TP /TC. Thanks to Alexpux. llvm-svn: 242283 --- clang/test/Driver/cl-inputs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clang/test/Driver/cl-inputs.c b/clang/test/Driver/cl-inputs.c index 6320009..1eee889 100644 --- a/clang/test/Driver/cl-inputs.c +++ b/clang/test/Driver/cl-inputs.c @@ -34,12 +34,13 @@ // WARN: note: The last /TC or /TP option takes precedence over earlier instances // WARN-NOT: note -// RUN: env LIB=%S/Inputs/cl-libs %clang_cl /c /TP cl-test.lib -### 2>&1 | FileCheck -check-prefix=TPlib %s +// MSYS2_ARG_CONV_EXCL tells MSYS2 to skip conversion of the specified argument. +// RUN: env LIB=%S/Inputs/cl-libs MSYS2_ARG_CONV_EXCL="/TP;/c" %clang_cl /c /TP cl-test.lib -### 2>&1 | FileCheck -check-prefix=TPlib %s // TPlib: warning: cl-test.lib: 'linker' input unused // TPlib: warning: argument unused during compilation: '/TP' // TPlib-NOT: cl-test.lib -// RUN: env LIB=%S/Inputs/cl-libs %clang_cl /c /TC cl-test.lib -### 2>&1 | FileCheck -check-prefix=TClib %s +// RUN: env LIB=%S/Inputs/cl-libs MSYS2_ARG_CONV_EXCL="/TC;/c" %clang_cl /c /TC cl-test.lib -### 2>&1 | FileCheck -check-prefix=TClib %s // TClib: warning: cl-test.lib: 'linker' input unused // TClib: warning: argument unused during compilation: '/TC' // TClib-NOT: cl-test.lib -- 2.7.4