[compiler-rt] 52ae891 - [compiler-rt][test] Add `env` command to fix command not found errors in compiler-rt with lit internal shell (#105917)

via llvm-commits llvm-commits at lists.llvm.org
Sun Aug 25 21:36:38 PDT 2024 

Author: Harini0924
Date: 2024-08-25T21:36:34-07:00
New Revision: 52ae891036e3ab1f668eb103c46ca57257901c6b

URL: https://github.com/llvm/llvm-project/commit/52ae891036e3ab1f668eb103c46ca57257901c6b
DIFF: https://github.com/llvm/llvm-project/commit/52ae891036e3ab1f668eb103c46ca57257901c6b.diff

LOG: [compiler-rt][test] Add `env` command to fix command not found errors in compiler-rt with lit internal shell (#105917)

There are several files in the compiler-rt subproject that have command
not found errors. This patch uses the `env` command to properly set the
environment variables correctly when using the lit internal shell.
fixes: #102395 
[This change is relevant [RFC] Enabling the lit internal shell by
Default](https://discourse.llvm.org/t/rfc-enabling-the-lit-internal-shell-by-default/80179)

Added: 
    

Modified: 
    compiler-rt/test/nsan/Posix/tls_reuse.c
    compiler-rt/test/nsan/nan.cpp
    compiler-rt/test/nsan/softmax.cpp
    compiler-rt/test/nsan/sum.cpp
    compiler-rt/test/nsan/vec_sqrt_ext.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/nsan/Posix/tls_reuse.c b/compiler-rt/test/nsan/Posix/tls_reuse.c
index e323260d15e385..6afa14b021bafd 100644
--- a/compiler-rt/test/nsan/Posix/tls_reuse.c
+++ b/compiler-rt/test/nsan/Posix/tls_reuse.c
@@ -1,6 +1,6 @@
 /// The static TLS block is reused among by threads. The shadow is cleared.
 // RUN: %clang_nsan %s -o %t
-// RUN: NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 %run %t
+// RUN: env NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 %run %t
 
 #include <pthread.h>
 #include <stdio.h>

diff  --git a/compiler-rt/test/nsan/nan.cpp b/compiler-rt/test/nsan/nan.cpp
index 59fc391a3e0a6b..c96ac261a233d4 100644
--- a/compiler-rt/test/nsan/nan.cpp
+++ b/compiler-rt/test/nsan/nan.cpp
@@ -1,11 +1,11 @@
 // RUN: %clangxx_nsan -O0 -g %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_nsan -O3 -g %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_nsan -O0 -g %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=1 not %run %t
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=1 not %run %t
 
 #include <cmath>
 #include <cstdio>

diff  --git a/compiler-rt/test/nsan/softmax.cpp b/compiler-rt/test/nsan/softmax.cpp
index 29eaa2f9607a20..ebe43dd087f799 100644
--- a/compiler-rt/test/nsan/softmax.cpp
+++ b/compiler-rt/test/nsan/softmax.cpp
@@ -1,14 +1,14 @@
 // RUN: %clangxx_nsan -O0 -g -DSOFTMAX=softmax %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=0,log2_max_relative_error=19 %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=0,log2_max_relative_error=19 %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_nsan -O3 -g -DSOFTMAX=softmax %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=0,log2_max_relative_error=19 %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=0,log2_max_relative_error=19 %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_nsan -O0 -g -DSOFTMAX=stable_softmax %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=1,log2_max_relative_error=19 %run %t 
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=1,log2_max_relative_error=19 %run %t 
 
 // RUN: %clangxx_nsan -O3 -g -DSOFTMAX=stable_softmax %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=1,log2_max_relative_error=19 %run %t
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=1,log2_max_relative_error=19 %run %t
 
 #include<iostream>
 #include<vector>
@@ -51,4 +51,4 @@ int main() {
     // CHECK: WARNING: NumericalStabilitySanitizer: NaN detected
   }
   return 0;
-}
\ No newline at end of file
+}

diff  --git a/compiler-rt/test/nsan/sum.cpp b/compiler-rt/test/nsan/sum.cpp
index 31bd62e73966bb..cd161c59bd60c3 100644
--- a/compiler-rt/test/nsan/sum.cpp
+++ b/compiler-rt/test/nsan/sum.cpp
@@ -1,14 +1,14 @@
 // RUN: %clangxx_nsan -O0 -mllvm -nsan-shadow-type-mapping=dqq -g -DSUM=NaiveSum -DFLT=float %s -o %t
-// RUN: NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 not %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 not %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_nsan -O3 -mllvm -nsan-shadow-type-mapping=dqq -g -DSUM=NaiveSum -DFLT=float %s -o %t
-// RUN: NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 not %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 not %run %t 2>&1 | FileCheck %s
 
 // RUN: %clangxx_nsan -O0 -mllvm -nsan-shadow-type-mapping=dqq -g -DSUM=KahanSum -DFLT=float %s -o %t
-// RUN: NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 %run %t
+// RUN: env NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 %run %t
 
 // RUN: %clangxx_nsan -O3 -mllvm -nsan-shadow-type-mapping=dqq -g -DSUM=KahanSum -DFLT=float %s -o %t
-// RUN: NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 %run %t
+// RUN: env NSAN_OPTIONS=halt_on_error=1,log2_max_relative_error=19 %run %t
 
 #include <chrono>
 #include <iostream>

diff  --git a/compiler-rt/test/nsan/vec_sqrt_ext.cpp b/compiler-rt/test/nsan/vec_sqrt_ext.cpp
index b39ce4b99bcab6..683cb458e54ae8 100644
--- a/compiler-rt/test/nsan/vec_sqrt_ext.cpp
+++ b/compiler-rt/test/nsan/vec_sqrt_ext.cpp
@@ -1,7 +1,7 @@
 // RUN: %clangxx_nsan -O0 -g -mavx %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_nsan -O3 -g -mavx %s -o %t
-// RUN: NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
+// RUN: env NSAN_OPTIONS=check_nan=true,halt_on_error=0 %run %t 2>&1 | FileCheck %s
 #include <iostream>
 #include <cmath>
 
@@ -22,4 +22,4 @@ int main() {
     // CHECK: WARNING: NumericalStabilitySanitizer: NaN detected
   }
   return 0;
-}
\ No newline at end of file
+}

More information about the llvm-commits mailing list