r192641 - Provide a dummy NetBSD tree and use --sysroot in the driver test.

Joerg Sonnenberger joerg at bec.de
Mon Oct 14 16:26:44 PDT 2013


Author: joerg
Date: Mon Oct 14 18:26:44 2013
New Revision: 192641

URL: http://llvm.org/viewvc/llvm-project?rev=192641&view=rev
Log:
Provide a dummy NetBSD tree and use --sysroot in the driver test.

Added:
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crt0.o
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtbegin.o
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtbeginS.o
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtend.o
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtendS.o
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crti.o
    cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtn.o
Modified:
    cfe/trunk/test/Driver/netbsd.c
    cfe/trunk/test/Driver/netbsd.cpp

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crt0.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crt0.o?rev=192641&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtbegin.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtbegin.o?rev=192641&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtbeginS.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtbeginS.o?rev=192641&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtend.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtend.o?rev=192641&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtendS.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtendS.o?rev=192641&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crti.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crti.o?rev=192641&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtn.o
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_netbsd_tree/usr/lib/crtn.o?rev=192641&view=auto
==============================================================================
    (empty)

Modified: cfe/trunk/test/Driver/netbsd.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.c?rev=192641&r1=192640&r2=192641&view=diff
==============================================================================
--- cfe/trunk/test/Driver/netbsd.c (original)
+++ cfe/trunk/test/Driver/netbsd.c Mon Oct 14 18:26:44 2013
@@ -1,45 +1,57 @@
-// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd %s -### 2>&1 \
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=X86_64 %s
-// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd7.0.0 %s -### 2>&1 \
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd7.0.0 \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=X86_64-7 %s
-// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd6.0.0 %s -### 2>&1 \
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd6.0.0 \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=X86_64-6 %s
 
-// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd %s -static -### 2>&1 \
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd -static \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=S-X86_64 %s
-// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd7.0.0 -static %s -### 2>&1 \
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd7.0.0 -static \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=S-X86_64-7 %s
-// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd6.0.0 -static %s -### 2>&1 \
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd6.0.0 -static \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=S-X86_64-6 %s
 
 // X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"
-// X86_64: "crtend.o" "crtn.o"
+// X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
+// X86_64: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"
-// X86_64-7: "crtend.o" "crtn.o"
+// X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// X86_64-7:  "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
+// X86_64-7: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"
+// X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
 // X86_64-6: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
-// X86_64-6: "crtend.o" "crtn.o"
+// X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // S-X86_64: ld{{.*}}" "-Bstatic"
-// S-X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"
-// S-X86_64: "crtend.o" "crtn.o"
+// S-X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// S-X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
+// S-X86_64: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // S-X86_64-7: ld{{.*}}" "-Bstatic"
-// S-X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"
-// S-X86_64-7: "crtend.o" "crtn.o"
+// S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// S-X86_64-7: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
+// S-X86_64-7: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // S-X86_64-6: ld{{.*}}" "-Bstatic"
-// S-X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"
+// S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// S-X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc"
 // S-X86_64-6: "-lgcc_eh" "-lc" "-lgcc"
-// S-X86_64-6: "crtend.o" "crtn.o"
+// S-X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"

Modified: cfe/trunk/test/Driver/netbsd.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.cpp?rev=192641&r1=192640&r2=192641&view=diff
==============================================================================
--- cfe/trunk/test/Driver/netbsd.cpp (original)
+++ cfe/trunk/test/Driver/netbsd.cpp Mon Oct 14 18:26:44 2013
@@ -1,45 +1,57 @@
-// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd %s -### 2>&1 \
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=X86_64 %s
-// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd7.0.0 %s -### 2>&1 \
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd7.0.0 \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=X86_64-7 %s
-// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd6.0.0 %s -### 2>&1 \
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd6.0.0 \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=X86_64-6 %s
 
-// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd %s -static -### 2>&1 \
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd -static \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=S-X86_64 %s
-// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd7.0.0 -static %s -### 2>&1 \
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd7.0.0 -static \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=S-X86_64-7 %s
-// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd6.0.0 -static %s -### 2>&1 \
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd6.0.0 -static \
+// RUN: --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \
 // RUN: | FileCheck -check-prefix=S-X86_64-6 %s
 
 // X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"
-// X86_64: "-lm" "-lc" "crtend.o" "crtn.o"
+// X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
+// X86_64: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"
-// X86_64-7: "-lm" "-lc" "crtend.o" "crtn.o"
+// X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// X86_64-7: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
+// X86_64-7: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
-// X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lstdc++"
+// X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lstdc++"
 // X86_64-6: "-lm" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"
-// X86_64-6: "crtend.o" "crtn.o"
+// X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"
 // S-X86_64: ld{{.*}}" "-Bstatic"
-// S-X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"
-// S-X86_64: "-lm" "-lc" "crtend.o" "crtn.o"
+// S-X86_64: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// S-X86_64: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
+// S-X86_64: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"
 // S-X86_64-7: ld{{.*}}" "-Bstatic"
-// S-X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"
-// S-X86_64-7: "-lm" "-lc" "crtend.o" "crtn.o"
+// S-X86_64-7: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// S-X86_64-7: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lc++"
+// S-X86_64-7: "-lm" "-lc" "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"
 
 // S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"
 // S-X86_64-6: ld{{.*}}" "-Bstatic"
-// S-X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lstdc++"
+// S-X86_64-6: "-o" "a.out" "{{.*}}/usr/lib/crt0.o" "{{.*}}/usr/lib/crti.o"
+// S-X86_64-6: "{{.*}}/usr/lib/crtbegin.o" "{{.*}}.o" "-lstdc++"
 // S-X86_64-6: "-lm" "-lc" "-lgcc_eh" "-lc" "-lgcc"
-// S-X86_64-6: "crtend.o" "crtn.o"
+// S-X86_64-6: "{{.*}}/usr/lib/crtend.o" "{{.*}}/usr/lib/crtn.o"





More information about the cfe-commits mailing list