From 89a40823009114285c7bd07a1ad1cc83b0580e4e Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Tue, 31 Mar 2015 21:43:52 +0000 Subject: [PATCH] Fix nacl's clang driver tests to tolerate libdir suffixes and Windows paths. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@233764 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Driver/nacl-direct.c | 96 +++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/test/Driver/nacl-direct.c b/test/Driver/nacl-direct.c index 87c25f67b1..32c36d169b 100644 --- a/test/Driver/nacl-direct.c +++ b/test/Driver/nacl-direct.c @@ -1,66 +1,66 @@ // Test clang changes for NaCl Support including: // include paths, library paths, emulation, default static // -// RUN: %clang -no-canonical-prefixes -### -o %t.o %s 2>&1 \ -// RUN: -target i686-unknown-nacl \ +// RUN: %clang -no-canonical-prefixes -### -o %t.o %s \ +// RUN: -target i686-unknown-nacl -resource-dir foo 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-I686 %s // CHECK-I686: {{.*}}clang{{.*}}" "-cc1" // CHECK-I686: "-fuse-init-array" // CHECK-I686: "-target-cpu" "pentium4" -// CHECK-I686: "-resource-dir" "{{.*}}/lib/clang/[[VER:[0-9.a-z\-]+]]" -// CHECK-I686: "-internal-isystem" "{{.*}}/../lib/clang/[[VER]]/include" -// CHECK-I686: "-internal-isystem" "{{.*}}/../x86_64-nacl/usr/include" -// CHECK-I686: "-internal-isystem" "{{.*}}/../x86_64-nacl/include" +// CHECK-I686: "-resource-dir" "foo" +// CHECK-I686: "-internal-isystem" "foo{{/|\\\\}}include" +// CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include" // CHECK-I686: as" "--32" // CHECK-I686: ld" // CHECK-I686: "--build-id" // CHECK-I686: "-m" "elf_i386_nacl" // CHECK-I686: "-static" -// CHECK-I686: "-L{{.*}}/../x86_64-nacl/lib32" -// CHECK-I686: "-L{{.*}}/../x86_64-nacl/usr/lib32" -// CHECK-I686: "-L{{.*}}/../lib/clang/[[VER]]/lib/i686-nacl" +// CHECK-I686: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}lib32" +// CHECK-I686: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}lib32" +// CHECK-I686: "-Lfoo{{/|\\\\}}lib{{/|\\\\}}i686-nacl" // CHECK-I686-NOT: -lpthread // -// RUN: %clang -no-canonical-prefixes -### -o %t.o %s 2>&1 \ -// RUN: -target x86_64-unknown-nacl \ +// RUN: %clang -no-canonical-prefixes -### -o %t.o %s \ +// RUN: -target x86_64-unknown-nacl -resource-dir foo 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-x86_64 %s // CHECK-x86_64: {{.*}}clang{{.*}}" "-cc1" // CHECK-x86_64: "-fuse-init-array" // CHECK-x86_64: "-target-cpu" "x86-64" -// CHECK-x86_64: "-resource-dir" "{{.*}}/lib/clang/[[VER:[0-9.a-z\-]+]]" -// CHECK-x86_64: "-internal-isystem" "{{.*}}/../lib/clang/[[VER]]/include" -// CHECK-x86_64: "-internal-isystem" "{{.*}}/../x86_64-nacl/usr/include" -// CHECK-x86_64: "-internal-isystem" "{{.*}}/../x86_64-nacl/include" +// CHECK-x86_64: "-resource-dir" "foo" +// CHECK-x86_64: "-internal-isystem" "foo{{/|\\\\}}include" +// CHECK-x86_64: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-x86_64: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include" // CHECK-x86_64: as" "--64" // CHECK-x86_64: ld" // CHECK-x86_64: "--build-id" // CHECK-x86_64: "-m" "elf_x86_64_nacl" // CHECK-x86_64: "-static" -// CHECK-x86_64: "-L{{.*}}/../x86_64-nacl/lib" -// CHECK-x86_64: "-L{{.*}}/../x86_64-nacl/usr/lib" -// CHECK-x86_64: "-L{{.*}}/../lib/clang/[[VER]]/lib/x86_64-nacl" +// CHECK-x86_64: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}lib" +// CHECK-x86_64: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}lib" +// CHECK-x86_64: "-Lfoo{{/|\\\\}}lib{{/|\\\\}}x86_64-nacl" // CHECK-X86_64-NOT: -lpthread // -// RUN: %clang -no-canonical-prefixes -### -o %t.o %s 2>&1 \ -// RUN: -target armv7a-unknown-nacl-gnueabihf \ +// RUN: %clang -no-canonical-prefixes -### -o %t.o %s \ +// RUN: -target armv7a-unknown-nacl-gnueabihf -resource-dir foo 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-ARM %s // CHECK-ARM: {{.*}}clang{{.*}}" "-cc1" // CHECK-ARM: "-fuse-init-array" // CHECK-ARM: "-target-cpu" "cortex-a8" // CHECK-ARM: "-target-abi" "aapcs-linux" // CHECK-ARM: "-mfloat-abi" "hard" -// CHECK-ARM: "-resource-dir" "{{.*}}/lib/clang/[[VER:[0-9.a-z\-]+]]" -// CHECK-ARM: "-internal-isystem" "{{.*}}/../lib/clang/[[VER]]/include" -// CHECK-ARM: "-internal-isystem" "{{.*}}/../arm-nacl/usr/include" -// CHECK-ARM: "-internal-isystem" "{{.*}}/../arm-nacl/include" +// CHECK-ARM: "-resource-dir" "foo" +// CHECK-ARM: "-internal-isystem" "foo{{/|\\\\}}include" +// CHECK-ARM: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-ARM: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}include" // CHECK-ARM: as" // CHECK-ARM: ld" // CHECK-ARM: "--build-id" // CHECK-ARM: "-m" "armelf_nacl" // CHECK-ARM: "-static" -// CHECK-ARM: "-L{{.*}}/../arm-nacl/lib" -// CHECK-ARM: "-L{{.*}}/../arm-nacl/usr/lib" -// CHECK-ARM: "-L{{.*}}/../lib/clang/[[VER]]/lib/arm-nacl" +// CHECK-ARM: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}lib" +// CHECK-ARM: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}usr{{/|\\\\}}lib" +// CHECK-ARM: "-Lfoo{{/|\\\\}}lib{{/|\\\\}}arm-nacl" // CHECK-ARM-NOT: -lpthread // Check that even when the target arch is just "arm" (as will be the case when @@ -74,35 +74,35 @@ // Test clang c++ include dirs and link line when using clang++ -// RUN: %clangxx -no-canonical-prefixes -### -o %t.o %s 2>&1 \ -// RUN: -target armv7a-unknown-nacl-gnueabihf \ +// RUN: %clangxx -no-canonical-prefixes -### -o %t.o %s \ +// RUN: -target armv7a-unknown-nacl-gnueabihf -resource-dir foo 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-ARM-CXX %s // CHECK-ARM-CXX: {{.*}}clang{{.*}}" "-cc1" -// CHECK-ARM-CXX: "-resource-dir" "{{.*}}/lib/clang/[[VER:[0-9.a-z\-]+]]" -// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}/../arm-nacl/include/c++/v1" -// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}/../lib/clang/[[VER]]/include" -// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}/../arm-nacl/usr/include" -// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}/../arm-nacl/include" +// CHECK-ARM-CXX: "-resource-dir" "foo" +// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1" +// CHECK-ARM-CXX: "-internal-isystem" "foo{{/|\\\\}}include" +// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-ARM-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}arm-nacl{{/|\\\\}}include" // CHECK-ARM-CXX: "-lpthread" -// RUN: %clangxx -no-canonical-prefixes -### -o %t.o %s 2>&1 \ -// RUN: -target i686-unknown-nacl \ +// RUN: %clangxx -no-canonical-prefixes -### -o %t.o %s \ +// RUN: -target i686-unknown-nacl -resource-dir foo 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-I686-CXX %s // CHECK-I686-CXX: {{.*}}clang{{.*}}" "-cc1" -// CHECK-I686-CXX: "-resource-dir" "{{.*}}/lib/clang/[[VER:[0-9.a-z\-]+]]" -// CHECK-I686-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/include/c++/v1" -// CHECK-I686-CXX: "-internal-isystem" "{{.*}}/../lib/clang/[[VER]]/include" -// CHECK-I686-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/usr/include" -// CHECK-I686-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/include" +// CHECK-I686-CXX: "-resource-dir" "foo" +// CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1" +// CHECK-I686-CXX: "-internal-isystem" "foo{{/|\\\\}}include" +// CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-I686-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include" // CHECK-I686-CXX: "-lpthread" -// RUN: %clangxx -no-canonical-prefixes -### -o %t.o %s 2>&1 \ -// RUN: -target x86_64-unknown-nacl \ +// RUN: %clangxx -no-canonical-prefixes -### -o %t.o %s \ +// RUN: -target x86_64-unknown-nacl -resource-dir foo 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-x86_64-CXX %s // CHECK-x86_64-CXX: {{.*}}clang{{.*}}" "-cc1" -// CHECK-x86_64-CXX: "-resource-dir" "{{.*}}/lib/clang/[[VER:[0-9.a-z\-]+]]" -// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/include/c++/v1" -// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}/../lib/clang/[[VER]]/include" -// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/usr/include" -// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/include" +// CHECK-x86_64-CXX: "-resource-dir" "foo" +// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}v1" +// CHECK-x86_64-CXX: "-internal-isystem" "foo{{/|\\\\}}include" +// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}usr{{/|\\\\}}include" +// CHECK-x86_64-CXX: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include" // CHECK-x86_64-CXX: "-lpthread" -- 2.40.0