[compiler-rt] Remove %T from tests #151265
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
%T has been deprecated for about seven years and use is to be avoided given it doesn't actually create a unique test directory per test, which can lead to races. Remove it from compiler-rt so we can hopefully remove it from within llvm-lit. This patch just touches the tests. There are still uses in some substitutions defined in compiler-rt/test/lit.common.cfg.py that I want to leave for a separate patch because it is quite a bit more thorny.
llvmbot added compiler-rt compiler-rt:asan 
Member
| @llvm/pr-subscribers-xray @llvm/pr-subscribers-compiler-rt-sanitizer Author: Aiden Grossman (boomanaiden154) Changes%T has been deprecated for about seven years and use is to be avoided given it doesn't actually create a unique test directory per test, which can lead to races. Remove it from compiler-rt so we can hopefully remove it from within llvm-lit. This patch just touches the tests. There are still uses in some substitutions defined in compiler-rt/test/lit.common.cfg.py that I want to leave for a separate patch because it is quite a bit more thorny. Full diff: https://github.com/llvm/llvm-project/pull/151265.diff 5 Files Affected:
diff --git a/compiler-rt/test/asan/TestCases/Linux/long-object-path.cpp b/compiler-rt/test/asan/TestCases/Linux/long-object-path.cpp index 592b0abb07d72..c01cc3be02185 100644 --- a/compiler-rt/test/asan/TestCases/Linux/long-object-path.cpp +++ b/compiler-rt/test/asan/TestCases/Linux/long-object-path.cpp @@ -1,6 +1,6 @@ -// RUN: mkdir -p %T/a-long-directory-name-to-test-allocations-for-exceptions-in-_dl_lookup_symbol_x-since-glibc-2.27 -// RUN: %clangxx_asan -g %s -o %T/long-object-path -// RUN: %run %T/a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../long-object-path +// RUN: mkdir -p %t.a-long-directory-name-to-test-allocations-for-exceptions-in-_dl_lookup_symbol_x-since-glibc-2.27 +// RUN: %clangxx_asan -g %s -o %t.long-object-path +// RUN: %run %t.a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../a-*/../long-object-path int main(void) { return 0; diff --git a/compiler-rt/test/fuzzer/afl-driver-stderr.test b/compiler-rt/test/fuzzer/afl-driver-stderr.test index 4b0c3b40221af..1ee096001243d 100644 --- a/compiler-rt/test/fuzzer/afl-driver-stderr.test +++ b/compiler-rt/test/fuzzer/afl-driver-stderr.test @@ -7,7 +7,8 @@ RUN: %no_fuzzer_cpp_compiler %S/AFLDriverTest.cpp %libfuzzer_src/afl/afl_driver. RUN: env -u AFL_DRIVER_STDERR_DUPLICATE_FILENAME %run %t-AFLDriverTest ; Test that specifying an invalid file causes a crash. -RUN: env ASAN_OPTIONS= AFL_DRIVER_STDERR_DUPLICATE_FILENAME="%T" not --crash %run %t-AFLDriverTest +RUN: mkdir -p %t.dir +RUN: env ASAN_OPTIONS= AFL_DRIVER_STDERR_DUPLICATE_FILENAME="%t.dir" not --crash %run %t-AFLDriverTest ; Test that a file is created when specified as the duplicate stderr. RUN: env AFL_DRIVER_STDERR_DUPLICATE_FILENAME=%t %run %t-AFLDriverTest diff --git a/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c b/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c index 8e131054c2d4d..bf0e4e1bc3763 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c +++ b/compiler-rt/test/sanitizer_common/TestCases/suffix-log-path_test.c @@ -1,12 +1,13 @@ -// RUN: %clang %s -o %T/suffix-log-path_test-binary +// RUN: rm -rf %t.dir +// RUN: mkdir -p %t.dir +// RUN: %clang %s -o %t.dir/suffix-log-path_test-binary // The glob below requires bash. // REQUIRES: shell // Good log_path with suffix. -// RUN: rm -f %T/sanitizer.log.*.txt -// RUN: %env_tool_opts=log_path=%T/sanitizer.log:log_exe_name=1:log_suffix=.txt %run %T/suffix-log-path_test-binary 2> %t.out -// RUN: FileCheck %s < %T/sanitizer.log.suffix-log-path_test-binary.*.txt +// RUN: %env_tool_opts=log_path=%t.dir/sanitizer.log:log_exe_name=1:log_suffix=.txt %run %t.dir/suffix-log-path_test-binary 2> %t.out +// RUN: FileCheck %s < %t.dir/sanitizer.log.suffix-log-path_test-binary.*.txt // UNSUPPORTED: ios, android diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp b/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp index 4a866e203e47a..6c94dbd8b21d2 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/fdr-mode-inmemory.cpp @@ -1,12 +1,14 @@ // RUN: %clangxx_xray -g -std=c++11 %s -o %t -fxray-modes=xray-fdr -// RUN: rm -f fdr-inmemory-test-* +// RUN: rm -rf %t.dir +// RUN: mkdir -p %t.dir +// RUN: cd %t.dir // RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \ // RUN: verbosity=1" \ // RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \ // RUN: %run %t 2>&1 | FileCheck %s -// RUN: FILES=`find %T -name 'fdr-inmemory-test-*' | wc -l` +// RUN: FILES=`find %t.dir -name 'fdr-inmemory-test-*' | wc -l` // RUN: [ $FILES -eq 0 ] -// RUN: rm -f fdr-inmemory-test-* +// RUN: rm -rf %t.dir // // REQUIRES: built-in-llvm-tree diff --git a/compiler-rt/test/xray/TestCases/Posix/fdr-mode-multiple.cpp b/compiler-rt/test/xray/TestCases/Posix/fdr-mode-multiple.cpp index b0411a2cc73fc..f9288d9002de0 100644 --- a/compiler-rt/test/xray/TestCases/Posix/fdr-mode-multiple.cpp +++ b/compiler-rt/test/xray/TestCases/Posix/fdr-mode-multiple.cpp @@ -1,12 +1,14 @@ // RUN: %clangxx_xray -g -std=c++11 %s -o %t -fxray-modes=xray-fdr -// RUN: rm -f fdr-inmemory-test-* +// RUN: rm -rf %t.dir +// RUN: mkdir -p %t.dir +// RUN: cd %t.dir // RUN: XRAY_OPTIONS="patch_premain=false xray_logfile_base=fdr-inmemory-test- \ // RUN: verbosity=1" \ // RUN: XRAY_FDR_OPTIONS="no_file_flush=true func_duration_threshold_us=0" \ // RUN: %run %t 2>&1 | FileCheck %s -// RUN: FILES=`find %T -name 'fdr-inmemory-test-*' | wc -l` +// RUN: FILES=`find %t.dir -name 'fdr-inmemory-test-*' | wc -l` // RUN: [ $FILES -eq 0 ] -// RUN: rm -f fdr-inmemory-test-* +// RUN: rm -rf %t.dir // // REQUIRES: built-in-llvm-tree |
fmayer reviewed Jul 30, 2025
| | ||
| ; Test that specifying an invalid file causes a crash. | ||
| RUN: env ASAN_OPTIONS= AFL_DRIVER_STDERR_DUPLICATE_FILENAME="%T" not --crash %run %t-AFLDriverTest | ||
| RUN: mkdir -p %t.dir |
Contributor
There was a problem hiding this comment.
Why do all the other tests rm -rf the dir but not this?
Contributor Author
There was a problem hiding this comment.
The other ones were deleting test artifacts originally whereas this one was not. I tried to preserve the existing behavior.
fmayer approved these changes Jul 30, 2025
Collaborator
| LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/20625 Here is the relevant piece of the build log for the reference |
Member
| This PR broke a few buildbots. Can you take a look? |
boomanaiden154 added a commit that referenced this pull request Jul 30, 2025
Contributor Author
| Sorry about that. Reverted in 3c3523c. |
Collaborator
| LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/56/builds/32060 Here is the relevant piece of the build log for the reference |
boomanaiden154 added a commit that referenced this pull request Jul 30, 2025
This reverts commit 3c3523c. Keeping the directory structure the same as before fixes the failures. They trivially reproduced locally and only passed before because I was not cleaning up the temp test directory in between invocations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
%T has been deprecated for about seven years and use is to be avoided given it doesn't actually create a unique test directory per test, which can lead to races. Remove it from compiler-rt so we can hopefully remove it from within llvm-lit.
This patch just touches the tests. There are still uses in some substitutions defined in compiler-rt/test/lit.common.cfg.py that I want to leave for a separate patch because it is quite a bit more thorny.