Skip to content

Commit e87dc2e

Browse files
[llvm-debuginfod] Update tests to work with internal shell (#158141)
This patch updates the llvm-debuginfod tests to work with the lit internal shell. One test was missing env before environment variables and another was using a brace expansion.
1 parent 20e55f3 commit e87dc2e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

llvm/test/tools/llvm-debuginfod-find/cache.test

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ REQUIRES: curl
22
UNSUPPORTED: system-windows
33

44
RUN: rm -rf %t/*
5-
RUN: mkdir -p %t/buildid/012345678901234{5,6}
5+
RUN: mkdir -p %t/buildid/0123456789012345
6+
RUN: mkdir -p %t/buildid/0123456789012346
67
RUN: echo 'f' > %t/buildid/0123456789012345/debuginfo
7-
RUN: cp %t/buildid/012345678901234{5,6}/debuginfo
8+
RUN: cp %t/buildid/0123456789012345/debuginfo %t/buildid/0123456789012346/debuginfo
89
RUN: mkdir %t/cache
910
RUN: env DEBUGINFOD_CACHE_PATH=%t/cache DEBUGINFOD_URLS=file://%t \
1011
RUN: llvm-debuginfod-find --debuginfo 0123456789012345 > /dev/null

llvm/test/tools/llvm-debuginfod/llvm-debuginfod.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
# RUN: rm -rf %t
1414
# RUN: mkdir %t
1515
# # Query the debuginfod server for artifacts
16-
# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-cmd 'llvm-debuginfod -v -c 3 %S/Inputs' \
16+
# RUN: env DEBUGINFOD_CACHE_PATH=%t %python %s --server-cmd 'llvm-debuginfod -v -c 3 %S/Inputs' \
1717
# RUN: --tool-cmd 'llvm-debuginfod-find --dump --executable 2c39b7557c50162aaeb5a3148c9f76e6e46012e3' | \
1818
# RUN: diff - %S/Inputs/main.exe
19-
# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-cmd 'llvm-debuginfod -v -c 3 %S/Inputs' \
19+
# RUN: env DEBUGINFOD_CACHE_PATH=%t %python %s --server-cmd 'llvm-debuginfod -v -c 3 %S/Inputs' \
2020
# RUN: --tool-cmd 'llvm-debuginfod-find --dump --debuginfo 2c39b7557c50162aaeb5a3148c9f76e6e46012e3' | \
2121
# RUN: diff - %S/Inputs/main-debug.exe
2222
# Debuginfod server does not yet support source files
2323

2424
# # The artifacts should still be present in the cache without needing to query
2525
# # the server.
26-
# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
26+
# RUN: env DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
2727
# RUN: --executable 2c39b7557c50162aaeb5a3148c9f76e6e46012e3 | \
2828
# RUN: diff - %S/Inputs/main.exe
29-
# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
29+
# RUN: env DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
3030
# RUN: --debuginfo 2c39b7557c50162aaeb5a3148c9f76e6e46012e3 | \
3131
# RUN: diff - %S/Inputs/main-debug.exe
3232

0 commit comments

Comments
 (0)