Skip to content

Commit bc1b63c

Browse files
committed
[RISCV][lit-on-qemu] Workaround for reinvocation of LLVM_EXTERNAL_LIT within clang tests
Specifically, update_cc_test_checks attempts to reinvoke LLVM_EXTERNAL_LIT. Avoid this by removing the setting in clang's lit.site.cfg.py when doing the 'pivot' to qemu-system.
1 parent 08ad2d5 commit bc1b63c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

buildbot/riscv-rise/lit-on-qemu

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ error() {{
105105
mkdir -p "{base_mount_path}" || error "Can't make mount path"
106106
chown {target_uid}:{target_gid} "{base_mount_path}" || error "Chown failed"
107107
mount -t ext4 /dev/vdb "{base_mount_path}" || error "Mount failed"
108+
if [ -f "{build_dir}/tools/clang/test/lit.site.cfg.py" ]; then
109+
# Workaround llvm_external_lit being re-invoked by update_cc_test_checks
110+
# tests.
111+
sed -i 's/^config\.llvm_external_lit.*$/config.llvm_external_lit = path(r"")/' "{build_dir}/tools/clang/test/lit.site.cfg.py"
112+
fi
108113
cd "{current_path}"
109114
su user -c "/usr/bin/python3 {build_dir}/bin/llvm-lit {args_string}"
110115
"""

0 commit comments

Comments
 (0)