Skip to content

Commit ee14e7d

Browse files
boomanaiden154boomanaiden154
committed
[𝘀𝗽𝗿] changes to main this commit is based on
Created using spr 1.3.7 [skip ci]
1 parent f03ccef commit ee14e7d

File tree

13 files changed

+66
-11
lines changed

13 files changed

+66
-11
lines changed

‎compiler-rt/test/asan/TestCases/log-path_test.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
// RUN: FileCheck %s --check-prefix=CHECK-BAD-DIR < %t.out
2626

2727
// Too long log_path.
28-
// RUN: %env_asan_opts=log_path=`for((i=0;i<10000;i++)); do echo -n $i; done` \
28+
// RUN: %python -c "for i in range(0, 10000): print(i, end='')" > %t.long_log_path
29+
// RUN: %env_asan_opts=log_path=%{readfile:%t.long_log_path} \
2930
// RUN: not %run %t 2> %t.out
3031
// RUN: FileCheck %s --check-prefix=CHECK-LONG < %t.out
3132

‎compiler-rt/test/asan/TestCases/scariness_score_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %clangxx_asan -O0 -mllvm -asan-use-stack-safety=0 %s -o %t
77
// On OSX and Windows, alloc_dealloc_mismatch=1 isn't 100% reliable, so it's
88
// off by default. It's safe for these tests, though, so we turn it on.
9-
// RUN: export %env_asan_opts=symbolize=0:detect_stack_use_after_return=1:handle_abort=1:print_scariness=1:alloc_dealloc_mismatch=1
9+
// RUN: %export_asan_opts=symbolize=0:detect_stack_use_after_return=1:handle_abort=1:print_scariness=1:alloc_dealloc_mismatch=1
1010
// Make sure the stack is limited (may not be the default under GNU make)
1111
// RUN: ulimit -s 4096
1212
// RUN: not %run %t 1 2>&1 | FileCheck %s --check-prefix=CHECK1
@@ -41,7 +41,7 @@
4141
// RUN: %clangxx_asan -O0 %s -o %t -fsanitize-address-use-after-return=always -mllvm -asan-use-stack-safety=0
4242
// On OSX and Windows, alloc_dealloc_mismatch=1 isn't 100% reliable, so it's
4343
// off by default. It's safe for these tests, though, so we turn it on.
44-
// RUN: export %env_asan_opts=symbolize=0:handle_abort=1:print_scariness=1:alloc_dealloc_mismatch=1
44+
// RUN: %export_asan_opts=symbolize=0:handle_abort=1:print_scariness=1:alloc_dealloc_mismatch=1
4545
// Make sure the stack is limited (may not be the default under GNU make)
4646
// RUN: ulimit -s 4096
4747
// RUN: not %run %t 1 2>&1 | FileCheck %s --check-prefix=CHECK1

‎compiler-rt/test/asan/lit.cfg.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ def get_required_attr(config, attr_name):
4141
config.substitutions.append(
4242
("%env_asan_opts=", "env ASAN_OPTIONS=" + default_asan_opts_str)
4343
)
44+
config.substitutions.append(
45+
("%export_asan_opts=", "export ASAN_OPTIONS=" + default_asan_opts_str)
46+
)
4447

4548
# Setup source root.
4649
config.test_source_root = os.path.dirname(__file__)

‎compiler-rt/test/lit.common.cfg.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,3 +1066,5 @@ def target_page_size():
10661066
# llvm.
10671067
config.substitutions.append(("%crt_src", config.compiler_rt_src_root))
10681068
config.substitutions.append(("%llvm_src", config.llvm_src_root))
1069+
1070+
config.substitutions.append(("%python", '"%s"' % (sys.executable)))

‎llvm/utils/lit/lit/TestRunner.py‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -602,16 +602,30 @@ def executeBuiltinUlimit(cmd, shenv):
602602
"""executeBuiltinUlimit - Change the current limits."""
603603
if os.name != "posix":
604604
raise InternalShellError(cmd, "'ulimit' not supported on this system")
605+
# Import resource here after we confirm we are on a POSIX system as the
606+
# module does not exist on Windows.
607+
import resource
605608
if len(cmd.args) != 3:
606609
raise InternalShellError(cmd, "'ulimit' requires two arguments")
607610
try:
608-
new_limit = int(cmd.args[2])
611+
if cmd.args[2] == "unlimited":
612+
new_limit = resource.RLIM_INFINITY
613+
else:
614+
new_limit = int(cmd.args[2])
609615
except ValueError as err:
610616
raise InternalShellError(cmd, "Error: 'ulimit': %s" % str(err))
611617
if cmd.args[1] == "-v":
612-
shenv.ulimit["RLIMIT_AS"] = new_limit * 1024
618+
if new_limit != resource.RLIM_INFINITY:
619+
new_limit = new_limit * 1024
620+
shenv.ulimit["RLIMIT_AS"] = new_limit
613621
elif cmd.args[1] == "-n":
614622
shenv.ulimit["RLIMIT_NOFILE"] = new_limit
623+
elif cmd.args[1] == "-s":
624+
if new_limit != resource.RLIM_INFINITY:
625+
new_limit = new_limit * 1024
626+
shenv.ulimit["RLIMIT_STACK"] = new_limit
627+
elif cmd.args[1] == "-f":
628+
shenv.ulimit["RLIMIT_FSIZE"] = new_limit
615629
else:
616630
raise InternalShellError(
617631
cmd, "'ulimit' does not support option: %s" % cmd.args[1]
@@ -811,6 +825,10 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper):
811825
not_args = []
812826
not_count = 0
813827
not_crash = False
828+
829+
# Expand all late substitutions.
830+
args = _expandLateSubstitutions(j, args, cmd_shenv.cwd)
831+
814832
while True:
815833
if args[0] == "env":
816834
# Create a copy of the global environment and modify it for
@@ -860,9 +878,6 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper):
860878
# Ensure args[0] is hashable.
861879
args[0] = expand_glob(args[0], cmd_shenv.cwd)[0]
862880

863-
# Expand all late substitutions.
864-
args = _expandLateSubstitutions(j, args, cmd_shenv.cwd)
865-
866881
inproc_builtin = inproc_builtins.get(args[0], None)
867882
if inproc_builtin and (args[0] != "echo" or len(cmd.commands) == 1):
868883
# env calling an in-process builtin is useless, so we take the safe

‎llvm/utils/lit/lit/builtin_commands/_launch_with_limit.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ def main(argv):
1717
resource.setrlimit(resource.RLIMIT_AS, limit)
1818
elif limit_str == "RLIMIT_NOFILE":
1919
resource.setrlimit(resource.RLIMIT_NOFILE, limit)
20+
elif limit_str == "RLIMIT_STACK":
21+
resource.setrlimit(resource.RLIMIT_STACK, limit)
22+
elif limit_str == "RLIMIT_FSIZE":
23+
resource.setrlimit(resource.RLIMIT_FSIZE, limit)
2024
process_output = subprocess.run(command_args)
2125
sys.exit(process_output.returncode)
2226

‎llvm/utils/lit/tests/Inputs/shtest-readfile/env.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Tests that readfile works with the env builtin.
2+
# RUN: echo -n "hello" > %t.1
3+
# RUN: env TEST=%{readfile:%t.1} python3 -c "import os; print(os.environ['TEST'])"
4+
5+
## Fail the test so we can assert on the output.
6+
# RUN: not echo return

‎llvm/utils/lit/tests/Inputs/shtest-ulimit/print_limits.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
print("RLIMIT_AS=" + str(resource.getrlimit(resource.RLIMIT_AS)[0]))
44
print("RLIMIT_NOFILE=" + str(resource.getrlimit(resource.RLIMIT_NOFILE)[0]))
5+
print("RLIMIT_STACK=" + str(resource.getrlimit(resource.RLIMIT_STACK)[0]))
6+
print("RLIMIT_FSIZE=" + str(resource.getrlimit(resource.RLIMIT_FSIZE)[0]))

‎llvm/utils/lit/tests/Inputs/shtest-ulimit/ulimit_okay.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# RUN: ulimit -n 50
2+
# RUN: ulimit -s 256
3+
# RUN: ulimit -f 5
24
# RUN: %{python} %S/print_limits.py
35
# Fail the test so that we can assert on the output.
46
# RUN: not echo return

‎llvm/utils/lit/tests/Inputs/shtest-ulimit/ulimit_unlimited.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# RUN: ulimit -f 5
2+
# RUN: %{python} %S/print_limits.py
3+
# RUN: ulimit -f unlimited
4+
# RUN: %{python} %S/print_limits.py
5+
# Fail the test so that we can assert on the output.
6+
# RUN: not echo return

0 commit comments

Comments
 (0)