Skip to content

Commit e6aefbe

Browse files
authored
[LLDB] Fix tests that fail when using internal shell. (#156931)
These tests were failing on darwin, because the internal shell needs environment var definitions to start with 'env'. This PR (hopefully) fixes that problem.
1 parent 6505bc3 commit e6aefbe

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

lldb/test/Shell/Host/TestCustomShell.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# XFAIL: system-openbsd
77

88
# RUN: %clang_host %S/Inputs/simple.c -g -o %t.out
9-
# RUN: SHELL=bogus not %lldb %t.out -b -o 'process launch -X 1 --' 2>&1 | FileCheck %s --check-prefix ERROR
9+
# RUN: env SHELL=bogus not %lldb %t.out -b -o 'process launch -X 1 --' 2>&1 | FileCheck %s --check-prefix ERROR
1010
# RUN: env -i ASAN_OPTIONS='detect_container_overflow=0' %lldb %t.out -b -o 'process launch -X 1 --' 2>&1 | FileCheck %s
1111

1212
# ERROR: error: shell expansion failed

lldb/test/Shell/SymbolFile/DWARF/deterministic-build.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// requires the ld64 linker, which clang invokes by default.
44
// REQUIRES: system-darwin
55
// RUN: %clang_host %s -g -c -o %t.o
6-
// RUN: ZERO_AR_DATE=1 %clang_host %t.o -g -o %t
6+
// RUN: env ZERO_AR_DATE=1 %clang_host %t.o -g -o %t
77
// RUN: %lldb %t -o "breakpoint set -f %s -l 11" -o run -o exit | FileCheck %s
88
// CHECK: stop reason = breakpoint
99

10-
1110
int main() { return 0; }

lldb/test/Shell/SymbolFile/add-dsym.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# HELP: Syntax: add-dsym <cmd-options> <filename>
55

66
# RUN: yaml2obj %S/Inputs/a.yaml -o %t.out
7-
# RUN: LLDB_APPLE_DSYMFORUUID_EXECUTABLE=%S/Inputs/dsymforuuid.sh %lldb %t.out -o 'add-dsym -u 41945CA4-5D9D-3CDE-82B4-37E4C09750B5' 2>&1 | FileCheck %s
7+
# RUN: env LLDB_APPLE_DSYMFORUUID_EXECUTABLE=%S/Inputs/dsymforuuid.sh %lldb %t.out -o 'add-dsym -u 41945CA4-5D9D-3CDE-82B4-37E4C09750B5' 2>&1 | FileCheck %s
88
# CHECK: UUID information was not found

0 commit comments

Comments
 (0)