[clang] 67aea3b - [clang] Make Driver tests pass when running with temp dir containing "crt"

Nico Weber via cfe-commits cfe-commits at lists.llvm.org
Mon Mar 28 13:06:54 PDT 2022


Author: Nico Weber
Date: 2022-03-28T16:06:43-04:00
New Revision: 67aea3b65cc5417a06712a22a2dfb5f3f7f43eff

URL: https://github.com/llvm/llvm-project/commit/67aea3b65cc5417a06712a22a2dfb5f3f7f43eff
DIFF: https://github.com/llvm/llvm-project/commit/67aea3b65cc5417a06712a22a2dfb5f3f7f43eff.diff

LOG: [clang] Make Driver tests pass when running with temp dir containing "crt"

In a recent run, temp files got created in /tmp/lit-tmp-2wcrtcx1/foo-xxx.o.
Since the tmp path contained "crt", this made a few tests fail:
http://45.33.8.238/linux/72221/step_7.txt

Not allowing '/' as path of the file name prevents this.

Differential Revision: https://reviews.llvm.org/D122547

Added: 
    

Modified: 
    clang/test/Driver/dragonfly.c
    clang/test/Driver/freebsd.c
    clang/test/Driver/fuchsia.c
    clang/test/Driver/linux-cross.cpp
    clang/test/Driver/netbsd.c
    clang/test/Driver/openbsd.c

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/dragonfly.c b/clang/test/Driver/dragonfly.c
index 6c6d1909fe1b0..683f8797aa621 100644
--- a/clang/test/Driver/dragonfly.c
+++ b/clang/test/Driver/dragonfly.c
@@ -9,4 +9,4 @@
 // RUN:   2>&1 | FileCheck %s --check-prefix=RELOCATABLE
 // RELOCATABLE:     "-r"
 // RELOCATABLE-NOT: "-l
-// RELOCATABLE-NOT: {{.*}}crt{{[^.]+}}.o
+// RELOCATABLE-NOT: {{.*}}crt{{[^./]+}}.o

diff  --git a/clang/test/Driver/freebsd.c b/clang/test/Driver/freebsd.c
index 06eb8880f577b..dc0b0bb99b820 100644
--- a/clang/test/Driver/freebsd.c
+++ b/clang/test/Driver/freebsd.c
@@ -211,4 +211,4 @@
 // RUN:   --sysroot=%S/Inputs/basic_freebsd64_tree 2>&1 | FileCheck %s --check-prefix=RELOCATABLE
 // RELOCATABLE:     "-r"
 // RELOCATABLE-NOT: "-l
-// RELOCATABLE-NOT: crt{{[^.]+}}.o
+// RELOCATABLE-NOT: crt{{[^./]+}}.o

diff  --git a/clang/test/Driver/fuchsia.c b/clang/test/Driver/fuchsia.c
index fdf7f4ef3f11b..3e8d7211a4e96 100644
--- a/clang/test/Driver/fuchsia.c
+++ b/clang/test/Driver/fuchsia.c
@@ -73,7 +73,7 @@
 // CHECK-RELOCATABLE-NOT: "--build-id"
 // CHECK-RELOCATABLE: "-r"
 // CHECK-RELOCATABLE-NOT: "-l
-// CHECK-RELOCATABLE-NOT: crt{{[^.]+}}.o
+// CHECK-RELOCATABLE-NOT: crt{{[^./]+}}.o
 
 // RUN: %clang %s -### --target=x86_64-unknown-fuchsia -nodefaultlibs -fuse-ld=lld 2>&1 \
 // RUN:     -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \

diff  --git a/clang/test/Driver/linux-cross.cpp b/clang/test/Driver/linux-cross.cpp
index 20d069112acf2..c989ca80938d8 100644
--- a/clang/test/Driver/linux-cross.cpp
+++ b/clang/test/Driver/linux-cross.cpp
@@ -220,4 +220,4 @@
 // RELOCATABLE:      "-L
 // RELOCATABLE-SAME: {{^}}[[SYSROOT]]/usr/lib/gcc/x86_64-linux-gnu/10"
 // RELOCATABLE-NOT:  "-l
-// RELOCATABLE-NOT:  crt{{[^.]+}}.o
+// RELOCATABLE-NOT:  crt{{[^./]+}}.o

diff  --git a/clang/test/Driver/netbsd.c b/clang/test/Driver/netbsd.c
index b549b3cde9b5a..e429729b71c7c 100644
--- a/clang/test/Driver/netbsd.c
+++ b/clang/test/Driver/netbsd.c
@@ -474,4 +474,4 @@
 // RUN: | FileCheck -check-prefix=RELOCATABLE %s
 // RELOCATABLE:     "-r"
 // RELOCATABLE-NOT: "-l
-// RELOCATABLE-NOT: crt{{[^.]+}}.o
+// RELOCATABLE-NOT: crt{{[^./]+}}.o

diff  --git a/clang/test/Driver/openbsd.c b/clang/test/Driver/openbsd.c
index 594f90ab3a386..5290b4811fa45 100644
--- a/clang/test/Driver/openbsd.c
+++ b/clang/test/Driver/openbsd.c
@@ -38,7 +38,7 @@
 // RUN:   | FileCheck --check-prefix=CHECK-MIPS64EL-LD %s
 // CHECK-LD-R:     "-r"
 // CHECK-LD-R-NOT: "-l
-// CHECK-LD-R-NOT: crt{{[^.]+}}.o
+// CHECK-LD-R-NOT: crt{{[^./]+}}.o
 // CHECK-LD-S: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd"
 // CHECK-LD-S: ld{{.*}}" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" "{{.*}}ld.so" "-o" "a.out" "{{.*}}crt0.o" "{{.*}}crtbegin.o" "-L{{.*}}" "-s" "{{.*}}.o" "-lcompiler_rt" "-lc" "-lcompiler_rt" "{{.*}}crtend.o"
 // CHECK-LD-T: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd"


        


More information about the cfe-commits mailing list