From 1a911aae4ec7358b340308f3558d6a144c479a28 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Tue, 2 Sep 2025 20:47:34 +0000 Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?= =?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.6 [skip ci] --- lld/test/COFF/color-diagnostics.test | 2 +- lld/test/COFF/linkrepro-res.test | 4 +- lld/test/COFF/linkrepro.test | 4 +- lld/test/ELF/arm-exidx-range.s | 4 +- lld/test/ELF/color-diagnostics.test | 2 +- lld/test/ELF/file-access.s | 3 +- lld/test/ELF/linkerscript/invalid.test | 2 +- lld/test/ELF/lto/comdat-nodeduplicate.ll | 14 ++- lld/test/ELF/lto/resolution-err.ll | 2 +- lld/test/MachO/color-diagnostics.test | 2 +- lld/test/MachO/framework.s | 3 +- .../MachO/implicit-and-allowable-clients.test | 5 +- .../link-search-at-loader-path-symlink.s | 4 +- lld/test/MachO/reexport-with-symlink.s | 3 +- lld/test/MachO/reexport-without-rpath.s | 4 +- lld/test/MachO/reproduce.s | 4 +- lld/test/MachO/stabs.s | 89 +++++++++++-------- lld/test/MachO/tapi-rpath.s | 4 +- lld/test/wasm/reproduce.s | 3 +- 19 files changed, 98 insertions(+), 60 deletions(-) diff --git a/lld/test/COFF/color-diagnostics.test b/lld/test/COFF/color-diagnostics.test index 210965d5267cf..37583462f44f1 100644 --- a/lld/test/COFF/color-diagnostics.test +++ b/lld/test/COFF/color-diagnostics.test @@ -1,5 +1,5 @@ # Windows command prompt doesn't support ANSI escape sequences. -# REQUIRES: shell +# UNSUPPORTED: system-windows # RUN: not lld-link -xyz --color-diagnostics /nosuchfile 2>&1 \ # RUN: | FileCheck -check-prefix=COLOR %s diff --git a/lld/test/COFF/linkrepro-res.test b/lld/test/COFF/linkrepro-res.test index cf0aa1636ce2d..fe564e9776114 100644 --- a/lld/test/COFF/linkrepro-res.test +++ b/lld/test/COFF/linkrepro-res.test @@ -1,4 +1,6 @@ -# REQUIRES: x86, shell +# REQUIRES: x86 +# Unsupported on Windows due to maximum path length limitations. +# UNSUPPORTED: system-windows # RUN: rm -rf %t.dir # RUN: mkdir -p %t.dir/build diff --git a/lld/test/COFF/linkrepro.test b/lld/test/COFF/linkrepro.test index a5779a9ec82e1..b1195cccb0e8a 100644 --- a/lld/test/COFF/linkrepro.test +++ b/lld/test/COFF/linkrepro.test @@ -1,4 +1,6 @@ -# REQUIRES: x86, shell +# REQUIRES: x86 +# Unsupported on Windows due to maximum path length limitations. +# UNSUPPORTED: system-windows # RUN: rm -rf %t.dir # RUN: split-file %s %t.dir diff --git a/lld/test/ELF/arm-exidx-range.s b/lld/test/ELF/arm-exidx-range.s index 4809109973585..b955b39e29f5c 100644 --- a/lld/test/ELF/arm-exidx-range.s +++ b/lld/test/ELF/arm-exidx-range.s @@ -1,4 +1,6 @@ -// REQUIRES: arm, shell +// REQUIRES: arm +// Fails for unclear reasons on 32-bit windows +// UNSUPPORTED: system-windows // RUN: llvm-mc --arm-add-build-attributes --triple=armv7a-linux-gnueabihf -filetype=obj %s -o %t.o // RUN: echo "SECTIONS { \ // RUN: . = 0x80000000; \ diff --git a/lld/test/ELF/color-diagnostics.test b/lld/test/ELF/color-diagnostics.test index 6d87b1130bee2..ad201fada283d 100644 --- a/lld/test/ELF/color-diagnostics.test +++ b/lld/test/ELF/color-diagnostics.test @@ -1,5 +1,5 @@ # Windows command prompt doesn't support ANSI escape sequences. -# REQUIRES: shell +# UNSUPPORTED: system-windows # RUN: not ld.lld -xyz --color-diagnostics /nosuchfile 2>&1 \ # RUN: | FileCheck -check-prefix=COLOR %s diff --git a/lld/test/ELF/file-access.s b/lld/test/ELF/file-access.s index 5a9e53b111404..8658f774682fe 100644 --- a/lld/test/ELF/file-access.s +++ b/lld/test/ELF/file-access.s @@ -1,4 +1,5 @@ -# REQUIRES: x86, shell +# REQUIRES: x86 +# UNSUPPORTED: system-windows # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o # RUN: ld.lld -r %t.o -o %t1.o diff --git a/lld/test/ELF/linkerscript/invalid.test b/lld/test/ELF/linkerscript/invalid.test index 73b761ce4d571..cb5e52c38dccc 100644 --- a/lld/test/ELF/linkerscript/invalid.test +++ b/lld/test/ELF/linkerscript/invalid.test @@ -5,7 +5,7 @@ ## We can't write quoted strings that are interpreted the same way ## by all echo commands. So, we don't want to run this on Windows. -# REQUIRES: shell +# UNSUPPORTED: system-windows # RUN: mkdir -p %t.dir diff --git a/lld/test/ELF/lto/comdat-nodeduplicate.ll b/lld/test/ELF/lto/comdat-nodeduplicate.ll index 13d4ab394813b..928da5c82e518 100644 --- a/lld/test/ELF/lto/comdat-nodeduplicate.ll +++ b/lld/test/ELF/lto/comdat-nodeduplicate.ll @@ -1,4 +1,4 @@ -; REQUIRES: x86, shell +; REQUIRES: x86 ;; Keep __profd_foo in a nodeduplicate comdat, despite a comdat of the same name ;; in a previous object file. @@ -36,19 +36,25 @@ ; RUN: ld.lld --thinlto-index-only --save-temps -u foo %t/a.bc %t/b.bc -o %t/ab ; RUN: FileCheck %s --check-prefix=RESOL_AB < %t/ab.resolution.txt -; RUN: (llvm-dis < %t/b.bc && llvm-dis < %t/b.bc.thinlto.bc) | FileCheck %s --check-prefix=IR_AB +; RUN: llvm-dis < %t/b.bc > %t.out +; RUN: llvm-dis < %t/b.bc.thinlto.bc >> %t.out +; RUN: FileCheck %s --check-prefix=IR_AB --input-file %t.out ; RUN: ld.lld -u foo %t/a.bc %t/b.bc -o %t/ab ; RUN: llvm-readelf -x .data %t/ab | FileCheck %s --check-prefix=DATA ; RUN: ld.lld --thinlto-index-only --save-temps -u foo %t/a.bc --start-lib %t/b.bc --end-lib -o %t/ab ; RUN: FileCheck %s --check-prefix=RESOL_AB < %t/ab.resolution.txt -; RUN: (llvm-dis < %t/b.bc && llvm-dis < %t/b.bc.thinlto.bc) | FileCheck %s --check-prefix=IR_AB +; RUN: llvm-dis < %t/b.bc > %t.out +; RUN: llvm-dis < %t/b.bc.thinlto.bc >> %t.out +; RUN: FileCheck %s --check-prefix=IR_AB --input-file %t.out ; RUN: ld.lld -u foo %t/a.bc --start-lib %t/b.bc --end-lib -o %t/ab ; RUN: llvm-readelf -x .data %t/ab | FileCheck %s --check-prefix=DATA ; RUN: ld.lld --thinlto-index-only --save-temps -u foo -u c %t/a.bc --start-lib %t/b.bc %t/c.bc --end-lib -o %t/abc ; RUN: FileCheck %s --check-prefix=RESOL_ABC < %t/abc.resolution.txt -; RUN: (llvm-dis < %t/b.bc && llvm-dis < %t/b.bc.thinlto.bc) | FileCheck %s --check-prefix=IR_ABC +; RUN: llvm-dis < %t/b.bc > %t.out +; RUN: llvm-dis < %t/b.bc.thinlto.bc >> %t.out +; RUN: FileCheck %s --check-prefix=IR_ABC --input-file %t.out ; RUN: ld.lld -u foo %t/a.bc --start-lib %t/b.bc %t/c.bc --end-lib -o %t/abc ; RUN: llvm-readelf -x .data %t/abc | FileCheck %s --check-prefix=DATA diff --git a/lld/test/ELF/lto/resolution-err.ll b/lld/test/ELF/lto/resolution-err.ll index f9855abaff327..6bc0bfc2f200d 100644 --- a/lld/test/ELF/lto/resolution-err.ll +++ b/lld/test/ELF/lto/resolution-err.ll @@ -1,5 +1,5 @@ ; UNSUPPORTED: system-windows -; REQUIRES: shell, non-root-user +; REQUIRES: non-root-user ; RUN: llvm-as %s -o %t.bc ; RUN: touch %t.resolution.txt ; RUN: chmod u-w %t.resolution.txt diff --git a/lld/test/MachO/color-diagnostics.test b/lld/test/MachO/color-diagnostics.test index b079c82e1a43a..465cba1750bc3 100644 --- a/lld/test/MachO/color-diagnostics.test +++ b/lld/test/MachO/color-diagnostics.test @@ -1,5 +1,5 @@ # Windows command prompt doesn't support ANSI escape sequences. -# REQUIRES: shell +# UNSUPPORTED: system-windows # RUN: not %lld --color-diagnostics /nosuchfile 2>&1 \ # RUN: | FileCheck -check-prefix=COLOR %s diff --git a/lld/test/MachO/framework.s b/lld/test/MachO/framework.s index 38925847935bb..c62eb12d31e8b 100644 --- a/lld/test/MachO/framework.s +++ b/lld/test/MachO/framework.s @@ -1,4 +1,5 @@ -# REQUIRES: x86, shell +# REQUIRES: x86 +# UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o # RUN: mkdir -p %t/Foo.framework/Versions/A diff --git a/lld/test/MachO/implicit-and-allowable-clients.test b/lld/test/MachO/implicit-and-allowable-clients.test index f627d242a0075..f5c13c250ea4a 100644 --- a/lld/test/MachO/implicit-and-allowable-clients.test +++ b/lld/test/MachO/implicit-and-allowable-clients.test @@ -1,4 +1,7 @@ -# REQUIRES: aarch64, shell +# ln -s is not guaranteed to work on Windows +# UNSUPPORTED: system-windows + +# REQUIRES: aarch64 # RUN: rm -rf %t; split-file %s %t # RUN: ln -s Versions/A/FrameworkPublic.tbd %t/System/Library/Frameworks/FrameworkPublic.framework/ # RUN: ln -s Versions/A/FrameworkPrivate.tbd %t/System/Library/Frameworks/FrameworkPrivate.framework/ diff --git a/lld/test/MachO/link-search-at-loader-path-symlink.s b/lld/test/MachO/link-search-at-loader-path-symlink.s index ff0f9481addf1..8b0aeb7faf0bf 100644 --- a/lld/test/MachO/link-search-at-loader-path-symlink.s +++ b/lld/test/MachO/link-search-at-loader-path-symlink.s @@ -1,4 +1,6 @@ -# REQUIRES: x86, shell +# REQUIRES: x86 +# Windows does not support rpath +# UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t diff --git a/lld/test/MachO/reexport-with-symlink.s b/lld/test/MachO/reexport-with-symlink.s index a6b5992713f39..c9cde5bc4f18b 100644 --- a/lld/test/MachO/reexport-with-symlink.s +++ b/lld/test/MachO/reexport-with-symlink.s @@ -1,4 +1,5 @@ -# REQUIRES: aarch64, shell +# REQUIRES: aarch64 +# UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t # RUN: ln -s Versions/A/Developer %t/Developer/Library/Frameworks/Developer.framework/ # RUN: llvm-mc -filetype obj -triple arm64-apple-macos11.0 %t/test.s -o %t/test.o diff --git a/lld/test/MachO/reexport-without-rpath.s b/lld/test/MachO/reexport-without-rpath.s index 741c33e81630d..a204c140c4a70 100644 --- a/lld/test/MachO/reexport-without-rpath.s +++ b/lld/test/MachO/reexport-without-rpath.s @@ -1,4 +1,6 @@ -# REQUIRES: aarch64, shell +# REQUIRES: aarch64 +# Windows does not support rpath +# UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t # RUN: ln -s Versions/A/Developer %t/Developer/Library/Frameworks/Developer.framework/ # RUN: ln -s Versions/A/DeveloperCore %t/Developer/Library/PrivateFrameworks/DeveloperCore.framework/ diff --git a/lld/test/MachO/reproduce.s b/lld/test/MachO/reproduce.s index 6f2ec680e124c..4a625387a1d2d 100644 --- a/lld/test/MachO/reproduce.s +++ b/lld/test/MachO/reproduce.s @@ -1,4 +1,6 @@ -# REQUIRES: x86, shell +# REQUIRES: x86_64 +# Unsupported on Windows due to maximum path length limitations. +# UNSUPPORTED: system-windows # RUN: rm -rf %t.dir # RUN: mkdir -p %t.dir/build1 diff --git a/lld/test/MachO/stabs.s b/lld/test/MachO/stabs.s index e32b9fc5b50d6..065dccbe72b41 100644 --- a/lld/test/MachO/stabs.s +++ b/lld/test/MachO/stabs.s @@ -1,4 +1,4 @@ -# REQUIRES: x86, shell +# REQUIRES: x86 # UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o @@ -9,61 +9,69 @@ # RUN: env TZ=GMT touch -t "197001010000.32" %t/foo.o # RUN: llvm-ar rcsU %t/foo.a %t/foo.o -# RUN: ZERO_AR_DATE=0 %lld -lSystem %t/test.o %t/foo.o %t/no-debug.o -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ -# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 +# RUN: env ZERO_AR_DATE=0 %lld -lSystem %t/test.o %t/foo.o %t/no-debug.o -o %t/test +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ +# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --input-file %t.out ## Check that we emit the right modtime even when the object file is in an ## archive. -# RUN: ZERO_AR_DATE=0 %lld -lSystem %t/test.o %t/foo.a %t/no-debug.o -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ -# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 +# RUN: env ZERO_AR_DATE=0 %lld -lSystem %t/test.o %t/foo.a %t/no-debug.o -o %t/test +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ +# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --input-file %t.out ## Check that we don't emit modtimes if ZERO_AR_DATE is set. # RUN: env ZERO_AR_DATE=1 %lld -lSystem %t/test.o %t/foo.o %t/no-debug.o \ # RUN: -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ -# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ +# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 --input-file %t.out # RUN: env %lld -lSystem %t/test.o %t/foo.a %t/no-debug.o \ # RUN: -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ -# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ +# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 --input-file %t.out # RUN: env %lld -lSystem %t/test.o %t/no-debug.o \ # RUN: -all_load %t/foo.a -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ -# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ +# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 --input-file %t.out # RUN: env %lld -lSystem %t/test.o %t/no-debug.o \ # RUN: -force_load %t/foo.a -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ -# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ +# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 --input-file %t.out # RUN: env ZERO_AR_DATE=0 %lld -lSystem -reproducible %t/test.o %t/foo.o \ # RUN: %t/no-debug.o -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ -# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ +# RUN: -D#TEST_TIME=0 -D#FOO_TIME=0 --input-file %t.out ## Check that we emit absolute paths to the object files in our OSO entries ## even if our inputs are relative paths. -# RUN: cd %t && ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -o test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ -# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 +# RUN: cd %t && env ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -o test +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.o \ +# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --input-file %t.out ## Check that we emit relative path to object files in OSO entries ## when -oso_prefix is used. -# RUN: cd %t && ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "%t" -o %t/test-rel +# RUN: cd %t && env ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "%t" -o %t/test-rel # RUN: dsymutil -s %t/test-rel | grep 'N_OSO' | FileCheck %s -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --check-prefix=REL-PATH -# RUN: cd %t && ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "%t/" -o %t/test-rel +# RUN: cd %t && env ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "%t/" -o %t/test-rel # RUN: dsymutil -s %t/test-rel | grep 'N_OSO' | FileCheck %s -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --check-prefix=REL-PATH-NO-SLASH -# RUN: cd %t && ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "." -o %t/test-rel-dot +# RUN: cd %t && env ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "." -o %t/test-rel-dot # RUN: dsymutil -s %t/test-rel-dot | grep 'N_OSO' | FileCheck %s -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --check-prefix=REL-DOT -# RUN: cd %t && ZERO_AR_DATE=0 %lld -lSystem ./test.o ./foo.o ./no-debug.o -oso_prefix "." -o %t/test-rel-dot +# RUN: cd %t && env ZERO_AR_DATE=0 %lld -lSystem ./test.o ./foo.o ./no-debug.o -oso_prefix "." -o %t/test-rel-dot # RUN: dsymutil -s %t/test-rel-dot | grep 'N_OSO' | FileCheck %s -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --check-prefix=REL-DOT-EXPLICIT ## Check that symlinks are not expanded when -oso_prefix . is used. @@ -71,9 +79,9 @@ # RUN: cp %t/test.o %t/foo.o %t/no-debug.o %t/private/var/folders/tmp # RUN: env TZ=GMT touch -t "197001010000.16" %t/private/var/folders/tmp/test.o # RUN: env TZ=GMT touch -t "197001010000.32" %t/private/var/folders/tmp/foo.o -# RUN: cd %t/var/folders/tmp && ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "." -o test-rel-symlink +# RUN: cd %t/var/folders/tmp && env ZERO_AR_DATE=0 %lld -lSystem test.o foo.o no-debug.o -oso_prefix "." -o test-rel-symlink # RUN: dsymutil -s %t/private/var/folders/tmp/test-rel-symlink | grep 'N_OSO' | FileCheck %s -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --check-prefix=REL-DOT -# RUN: cd %t/var/folders/tmp && ZERO_AR_DATE=0 %lld -lSystem ./test.o ./foo.o ./no-debug.o -oso_prefix "." -o test-rel-symlink +# RUN: cd %t/var/folders/tmp && env ZERO_AR_DATE=0 %lld -lSystem ./test.o ./foo.o ./no-debug.o -oso_prefix "." -o test-rel-symlink # RUN: dsymutil -s %t/private/var/folders/tmp/test-rel-symlink | grep 'N_OSO' | FileCheck %s -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --check-prefix=REL-DOT-EXPLICIT ## Check that we don't emit DWARF or stabs when -S is used @@ -82,10 +90,11 @@ ## expect to not find any entries which requires the exit code to be negated. # RUN: llvm-nm -ap %t/test-no-debug | not grep -e ' - ' -# RUN: cd %t && ZERO_AR_DATE=0 %lld -lSystem test.o foo.a no-debug.o -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | \ -# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ -# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 +# RUN: cd %t && env ZERO_AR_DATE=0 %lld -lSystem test.o foo.a no-debug.o -o %t/test +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s -DDIR=%t -DFOO_PATH=%t/foo.a\(foo.o\) \ +# RUN: -D#TEST_TIME=0x10 -D#FOO_TIME=0x20 --input-file %t.out # CHECK: Sections: # CHECK-NEXT: Idx Name @@ -159,7 +168,9 @@ ## when forming N_SO. # RUN: llvm-mc -filetype obj -triple=x86_64-apple-darwin %t/abs-path.s -o %t/abs-path.o # RUN: %lld %t/abs-path.o -o %t/test -# RUN: (llvm-objdump --section-headers %t/test; dsymutil -s %t/test) | FileCheck %s --check-prefix=ABS-PATH +# RUN: llvm-objdump --section-headers %t/test > %t.out +# RUN: dsymutil -s %t/test >> %t.out +# RUN: FileCheck %s --check-prefix=ABS-PATH --input-file %t.out # ABS-PATH: (N_SO ) 00 0000 0000000000000000 '/foo.cpp' #--- test.s diff --git a/lld/test/MachO/tapi-rpath.s b/lld/test/MachO/tapi-rpath.s index 48032f28a6ce6..23187e797466b 100644 --- a/lld/test/MachO/tapi-rpath.s +++ b/lld/test/MachO/tapi-rpath.s @@ -1,4 +1,6 @@ -# REQUIRES: aarch64, shell +# REQUIRES: aarch64 +# Windows does not support rpath +# UNSUPPORTED: system-windows # RUN: rm -rf %t; split-file %s %t # RUN: ln -s Versions/A/Developer %t/Developer/Library/Frameworks/Developer.framework/ # RUN: ln -s Versions/A/DeveloperCore %t/Developer/Library/PrivateFrameworks/DeveloperCore.framework/ diff --git a/lld/test/wasm/reproduce.s b/lld/test/wasm/reproduce.s index a89843fe219e3..40e9ad3794d5e 100644 --- a/lld/test/wasm/reproduce.s +++ b/lld/test/wasm/reproduce.s @@ -1,4 +1,5 @@ -# REQUIRES: shell +# Unsupported on Windows due to maximum path length limitations. +# UNSUPPORTED: system-windows # RUN: rm -rf %t.dir # RUN: mkdir -p %t.dir # RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.dir/foo.o %s From 91ad70dd981abbf1c5fc2e6df17ff3ee4796e510 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Wed, 3 Sep 2025 15:50:33 +0000 Subject: [PATCH 2/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?= =?UTF-8?q?anges=20introduced=20through=20rebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.6 [skip ci] --- lld/test/MachO/reproduce.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lld/test/MachO/reproduce.s b/lld/test/MachO/reproduce.s index 4a625387a1d2d..68d94cab2c7ee 100644 --- a/lld/test/MachO/reproduce.s +++ b/lld/test/MachO/reproduce.s @@ -1,4 +1,4 @@ -# REQUIRES: x86_64 +# REQUIRES: x86 # Unsupported on Windows due to maximum path length limitations. # UNSUPPORTED: system-windows