Skip to content

Commit d70497e

Browse files
cmticemahesh-attarde
authored andcommitted
[compiler-rt] Fix some tests to work with lit internal shell. (llvm#160728)
This is part of our work to migrate lit tests to use internal shell by default (performance improvements).
1 parent affeeab commit d70497e

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

compiler-rt/test/fuzzer/fork-sigusr.test

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# Check that libFuzzer honors SIGUSR1/SIGUSR2
22
# Disabled on Windows which does not have SIGUSR1/SIGUSR2.
3-
REQUIRES: shell
43
UNSUPPORTED: darwin, target={{.*windows.*}}, target=aarch64{{.*}}
54
RUN: rm -rf %t
65
RUN: mkdir -p %t
76
RUN: %cpp_compiler %S/SleepOneSecondTest.cpp -o %t/ForkSIGUSR
87

9-
RUN: %run %t/ForkSIGUSR -fork=3 -ignore_crashes=1 2>%t/log & export PID=$!
8+
# The line below needs the " | env" at the end, in order to make the
9+
# script continue executing, rather than waiting (forever) for the
10+
# 'nohup run...' command to finish.
11+
RUN: bash -c "nohup %run %t/ForkSIGUSR -fork=3 -ignore_crashes=1 2>%t/log & echo -n $! > %t2" | env
1012
RUN: sleep 3
11-
RUN: kill -SIGUSR2 $PID
13+
RUN: kill -SIGUSR2 %{readfile:%t2}
1214
RUN: sleep 6
1315
RUN: cat %t/log | FileCheck %s --dump-input=fail
1416

compiler-rt/test/fuzzer/sigint.test

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
REQUIRES: shell, msan
1+
REQUIRES: msan
22
UNSUPPORTED: target=arm{{.*}}
33

44
# Check that libFuzzer exits gracefully under SIGINT with MSan.
55
RUN: rm -rf %t
66
RUN: mkdir -p %t
77
RUN: %msan_compiler %S/SleepOneSecondTest.cpp -o %t/LFSIGINT
88

9-
RUN: %run %t/LFSIGINT 2> %t/log & export PID=$!
9+
# The line below needs the " | env" at the end, in order to make the
10+
# script continue executing, rather than waiting (forever) for the
11+
# 'nohup run...' command to finish.
12+
RUN: bash -c "nohup %run %t/LFSIGINT 2> %t/log & echo -n $! > %t2" | env
1013
RUN: sleep 2
11-
RUN: kill -SIGINT $PID
14+
RUN: kill -SIGINT %{readfile:%t2}
1215
RUN: sleep 3
1316
RUN: cat %t/log | FileCheck %s
1417

compiler-rt/test/fuzzer/sigusr.test

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# FIXME: Disabled on Windows for now because of reliance on posix only features
22
# (eg: export, "&", pkill).
3-
REQUIRES: shell
43
UNSUPPORTED: darwin, target={{.*windows.*}}
54
# Check that libFuzzer honors SIGUSR1/SIGUSR2
65
RUN: rm -rf %t
76
RUN: mkdir -p %t
87
RUN: %cpp_compiler %S/SleepOneSecondTest.cpp -o %t/LFSIGUSR
98

10-
RUN: %run %t/LFSIGUSR 2> %t/log & export PID=$!
9+
# The line below needs the " | env" at the end, in order to make the
10+
# script continue executing, rather than waiting (forever) for the
11+
# 'nohup run...' command to finish.
12+
RUN: bash -c "nohup %run %t/LFSIGUSR 2> %t/log & echo -n $! > %t2"| env
1113
RUN: sleep 2
12-
RUN: kill -SIGUSR1 $PID
14+
RUN: kill -SIGUSR1 %{readfile:%t2}
1315
RUN: sleep 3
1416
RUN: cat %t/log | FileCheck %s
1517

compiler-rt/test/msan/allocator_mapping.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// mapping the heap early, in __msan_init.
44
//
55
// RUN: %clangxx_msan -O0 %s -o %t_1
6-
// RUN: %clangxx_msan -O0 -DHEAP_ADDRESS=$(%run %t_1) %s -o %t_2 && %run %t_2
6+
// RUN: %run %t_1 > %t_3
7+
// RUN: %clangxx_msan -O0 -DHEAP_ADDRESS=%{readfile:%t_3} %s -o %t_2 && %run %t_2
78
//
89
// This test only makes sense for the 64-bit allocator. The 32-bit allocator
910
// does not have a fixed mapping. Exclude platforms that use the 32-bit

compiler-rt/test/nsan/Posix/allocator_mapping.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/// Test that a module constructor can not map memory over the NSan heap
33
/// (without MAP_FIXED, of course).
44
// RUN: %clangxx_nsan -O0 %s -o %t_1
5-
// RUN: %clangxx_nsan -O0 -DHEAP_ADDRESS=$(%run %t_1) %s -o %t_2 && %run %t_2
5+
// RUN: %run %t_1 > %t_3
6+
// RUN: %clangxx_nsan -O0 -DHEAP_ADDRESS=%{readfile:%t_3} %s -o %t_2 && %run %t_2
67

78
#include <assert.h>
89
#include <stdio.h>

0 commit comments

Comments
 (0)