[cfe-commits] r148949 - in /cfe/trunk/test/Driver: ./ Inputs/basic_freebsd64_tree/ Inputs/basic_freebsd64_tree/lib/ Inputs/basic_freebsd64_tree/usr/ Inputs/basic_freebsd64_tree/usr/lib/ Inputs/basic_freebsd64_tree/usr/lib32/ Inputs/basic_freebsd_tree/ Inputs/basic_freebsd_tree/lib/ Inputs/basic_freebsd_tree/usr/ Inputs/basic_freebsd_tree/usr/lib/

[Chandler Carruth]

Author: chandlerc
Date: Wed Jan 25 04:50:34 2012
New Revision: 148949

URL: http://llvm.org/viewvc/llvm-project?rev=148949&view=rev
Log:
Add some really minimalist freebsd testing trees and use them in the
freebsd test so that it's behavior isn't dependent on the filesystem of
the host running the tests. This should revive the build bots at least.
The tests and the trees still need a lot of love to make them as useful
and easy to maintain as linux-ld.c.

Added:
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/lib/
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/lib/.keep
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib/
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib/.keep
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib32/
    cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib32/.keep
    cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/
    cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/lib/
    cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/lib/.keep
    cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/usr/
    cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/usr/lib/
    cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/usr/lib/.keep
Modified:
    cfe/trunk/test/Driver/freebsd.c

Added: cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/lib/.keep?rev=148949&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib/.keep?rev=148949&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib32/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_freebsd64_tree/usr/lib32/.keep?rev=148949&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/lib/.keep?rev=148949&view=auto
==============================================================================
    (empty)

Added: cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/usr/lib/.keep
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/Inputs/basic_freebsd_tree/usr/lib/.keep?rev=148949&view=auto
==============================================================================
    (empty)

Modified: cfe/trunk/test/Driver/freebsd.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/freebsd.c?rev=148949&r1=148948&r2=148949&view=diff
==============================================================================
--- cfe/trunk/test/Driver/freebsd.c (original)
+++ cfe/trunk/test/Driver/freebsd.c Wed Jan 25 04:50:34 2012
@@ -1,19 +1,20 @@
-// RUN: %clang -no-canonical-prefixes -ccc-clang-archs "" -target powerpc64-pc-freebsd8 %s -### 2> %t
+// RUN: %clang -no-canonical-prefixes --sysroot=%S/Inputs/basic_freebsd_tree -ccc-clang-archs "" -target powerpc64-pc-freebsd8 %s -### 2> %t
 // RUN: FileCheck --check-prefix=CHECK-PPC < %t %s
 //
 // CHECK-PPC: clang{{.*}}" "-cc1" "-triple" "powerpc64-pc-freebsd8"
-// CHECK-PPC: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "{{.*}}ld-elf{{.*}}" "-o" "a.out" "{{.*}}crt1.o" "{{.*}}crti.o" "{{.*}}crtbegin.o" "-L/usr/lib" "{{.*}}.o" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "{{.*}}crtend.o" "{{.*}}crtn.o"
+// CHECK-PPC: ld{{.*}}" "--sysroot=[[SYSROOT:[^"]+]]"
+// CHECK-PPC: "--eh-frame-hdr" "-dynamic-linker" "{{.*}}ld-elf{{.*}}" "-o" "a.out" "{{.*}}crt1.o" "{{.*}}crti.o" "{{.*}}crtbegin.o" "-L[[SYSROOT]]/usr/lib" "{{.*}}.o" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" "{{.*}}crtend.o" "{{.*}}crtn.o"
 
 
 // Check that -m32 properly adjusts the toolchain flags.
 //
-// RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd8 -m32 -### %s 2> %t
+// RUN: %clang -no-canonical-prefixes --sysroot=%S/Inputs/basic_freebsd64_tree -target x86_64-pc-freebsd8 -m32 -### %s 2> %t
 // RUN: FileCheck --check-prefix=CHECK-LIB32 < %t %s
 //
 // CHECK-LIB32: clang{{.*}}" "-cc1" "-triple" "i386-pc-freebsd8"
 // CHECK-LIB32: ld{{.*}}" {{.*}} "-m" "elf_i386_fbsd"
 //
-// RUN: %clang -target x86_64-pc-freebsd8 -m32 -print-search-dirs %s > %t
+// RUN: %clang --sysroot=%S/Inputs/basic_freebsd64_tree -target x86_64-pc-freebsd8 -m32 -print-search-dirs %s > %t
 // RUN: FileCheck --check-prefix=CHECK-LIB32PATHS < %t %s
 //
 // CHECK-LIB32PATHS: libraries: ={{.*:?}}/usr/lib32