[lld] 4b89629 - [lld-macho][NFC] Purge stale test-output trees prior to split-file

Greg McGary via llvm-commits llvm-commits at lists.llvm.org
Sat May 8 17:36:57 PDT 2021 

Author: Greg McGary
Date: 2021-05-08T17:36:30-07:00
New Revision: 4b8962940322fe732126ec583013ecb5b6a1112e

URL: https://github.com/llvm/llvm-project/commit/4b8962940322fe732126ec583013ecb5b6a1112e
DIFF: https://github.com/llvm/llvm-project/commit/4b8962940322fe732126ec583013ecb5b6a1112e.diff

LOG: [lld-macho][NFC] Purge stale test-output trees prior to split-file

Enforce standard practice

Differential Revision: https://reviews.llvm.org/D102112

Added: 
    

Modified: 
    lld/test/MachO/U-dynamic-lookup.s
    lld/test/MachO/adhoc-codesign.s
    lld/test/MachO/common-symbol-coalescing.s
    lld/test/MachO/dependency-info.s
    lld/test/MachO/dylib-stub.yaml
    lld/test/MachO/entry-symbol.s
    lld/test/MachO/flat-namespace.s
    lld/test/MachO/indirect-symtab.s
    lld/test/MachO/invalid/abs-duplicate.s
    lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s
    lld/test/MachO/invalid/range-check.s
    lld/test/MachO/invalid/undefined-symbol.s
    lld/test/MachO/lc-linker-option.ll
    lld/test/MachO/nonweak-definition-override.s
    lld/test/MachO/private-extern.s
    lld/test/MachO/t.s
    lld/test/MachO/thin-archive.s
    lld/test/MachO/tlv-dylib.s
    lld/test/MachO/u.s
    lld/test/MachO/weak-binding.s
    lld/test/MachO/weak-header-flags.s
    lld/test/MachO/weak-import.s
    lld/test/MachO/why-load.s

Removed: 
    


################################################################################
diff  --git a/lld/test/MachO/U-dynamic-lookup.s b/lld/test/MachO/U-dynamic-lookup.s
index 823078e9a5052..2f867f87fe842 100644
--- a/lld/test/MachO/U-dynamic-lookup.s
+++ b/lld/test/MachO/U-dynamic-lookup.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
 # RUN: %lld -dylib -o %t/foo.dylib %t/foo.o

diff  --git a/lld/test/MachO/adhoc-codesign.s b/lld/test/MachO/adhoc-codesign.s
index 7828f03d06360..d9817b77a5308 100644
--- a/lld/test/MachO/adhoc-codesign.s
+++ b/lld/test/MachO/adhoc-codesign.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86, aarch64
 
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=arm64-apple-macos -o %t/main-arm64-macos.o %t/main.s
 # RUN: llvm-mc -filetype=obj -triple=arm64-apple-iossimulator -o %t/main-arm64-sim.o %t/main.s

diff  --git a/lld/test/MachO/common-symbol-coalescing.s b/lld/test/MachO/common-symbol-coalescing.s
index 521602f05ddcb..3ab3aaeb16d21 100644
--- a/lld/test/MachO/common-symbol-coalescing.s
+++ b/lld/test/MachO/common-symbol-coalescing.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# 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
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/same-size.s -o %t/same-size.o

diff  --git a/lld/test/MachO/dependency-info.s b/lld/test/MachO/dependency-info.s
index 761fb4393ae0b..fe7c33ace8f4c 100644
--- a/lld/test/MachO/dependency-info.s
+++ b/lld/test/MachO/dependency-info.s
@@ -1,7 +1,7 @@
 # REQUIRES: x86
 #
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
 # RUN: %lld -dylib -o %t/libfoo.dylib %t/foo.o

diff  --git a/lld/test/MachO/dylib-stub.yaml b/lld/test/MachO/dylib-stub.yaml
index 9f0328a17e6a8..fc50be35bdf0f 100644
--- a/lld/test/MachO/dylib-stub.yaml
+++ b/lld/test/MachO/dylib-stub.yaml
@@ -9,7 +9,7 @@
 ## taking a non-stub dylib and editing the appropriate fields.
 
 # REQUIRES: x86
-# RUN: split-file %s %t
+# 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
 # RUN: yaml2obj %t/fat.dylib.yaml > %t/fat.dylib
 # RUN: %lld -lSystem %t/test.o %t/fat.dylib -o %t/test

diff  --git a/lld/test/MachO/entry-symbol.s b/lld/test/MachO/entry-symbol.s
index ddee4e90db17f..05796d6b4b732 100644
--- a/lld/test/MachO/entry-symbol.s
+++ b/lld/test/MachO/entry-symbol.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/not-main.s -o %t/not-main.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o
 # RUN: %lld -lSystem -dylib %t/libfoo.o -o %t/libfoo.dylib

diff  --git a/lld/test/MachO/flat-namespace.s b/lld/test/MachO/flat-namespace.s
index 125b8461d6a47..79d575c480dd3 100644
--- a/lld/test/MachO/flat-namespace.s
+++ b/lld/test/MachO/flat-namespace.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
 # RUN: %lld -dylib -o %t/foo.dylib %t/foo.o

diff  --git a/lld/test/MachO/indirect-symtab.s b/lld/test/MachO/indirect-symtab.s
index b8b23698b92fc..10cae0bd24777 100644
--- a/lld/test/MachO/indirect-symtab.s
+++ b/lld/test/MachO/indirect-symtab.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/test.s -o %t/test.o
 # RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib -lSystem

diff  --git a/lld/test/MachO/invalid/abs-duplicate.s b/lld/test/MachO/invalid/abs-duplicate.s
index 1cd11d6ef4a20..ff1d75e5b35b1 100644
--- a/lld/test/MachO/invalid/abs-duplicate.s
+++ b/lld/test/MachO/invalid/abs-duplicate.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# 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
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weakfoo.s -o %t/weakfoo.o
 # RUN: not %lld -lSystem %t/test.o %t/weakfoo.o -o %t/test 2>&1 | FileCheck %s

diff  --git a/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s b/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s
index da1b30f3ea502..85a077e4a35e7 100644
--- a/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s
+++ b/lld/test/MachO/invalid/bad-got-to-dylib-tlv-reference.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libtlv.s -o %t/libtlv.o
 # RUN: %lld -dylib -install_name @executable_path/libtlv.dylib \

diff  --git a/lld/test/MachO/invalid/range-check.s b/lld/test/MachO/invalid/range-check.s
index dd19f8d2f28db..c25d367dd1184 100644
--- a/lld/test/MachO/invalid/range-check.s
+++ b/lld/test/MachO/invalid/range-check.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 
-# RUN: split-file %s %t
+# 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
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/bar.s -o %t/bar.o
 # RUN: %lld -dylib %t/bar.o -o %t/libbar.dylib

diff  --git a/lld/test/MachO/invalid/undefined-symbol.s b/lld/test/MachO/invalid/undefined-symbol.s
index cb89da052d769..dd6fa1728e048 100644
--- a/lld/test/MachO/invalid/undefined-symbol.s
+++ b/lld/test/MachO/invalid/undefined-symbol.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/main.s -o %t/main.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o
 # RUN: llvm-ar crs %t/foo.a %t/foo.o

diff  --git a/lld/test/MachO/lc-linker-option.ll b/lld/test/MachO/lc-linker-option.ll
index 48f93c3d64084..fae023bd70c9e 100644
--- a/lld/test/MachO/lc-linker-option.ll
+++ b/lld/test/MachO/lc-linker-option.ll
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-as %t/framework.ll -o %t/framework.o
 # RUN: %lld %t/framework.o -o %t/frame

diff  --git a/lld/test/MachO/nonweak-definition-override.s b/lld/test/MachO/nonweak-definition-override.s
index 30bf5d379b766..d0742ce72106e 100644
--- a/lld/test/MachO/nonweak-definition-override.s
+++ b/lld/test/MachO/nonweak-definition-override.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/nonweakdef.s -o %t/nonweakdef.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weakdef.s -o %t/weakdef.o

diff  --git a/lld/test/MachO/private-extern.s b/lld/test/MachO/private-extern.s
index cfc65651eb44e..66de0f4a00b29 100644
--- a/lld/test/MachO/private-extern.s
+++ b/lld/test/MachO/private-extern.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos \
 # RUN:     %t/basics.s -o %t/basics.o
 

diff  --git a/lld/test/MachO/t.s b/lld/test/MachO/t.s
index 7ff97dacdf92b..c8fe0b2de3452 100644
--- a/lld/test/MachO/t.s
+++ b/lld/test/MachO/t.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
 # RUN: %lld -dylib -o %t/libfoo.dylib %t/foo.o

diff  --git a/lld/test/MachO/thin-archive.s b/lld/test/MachO/thin-archive.s
index 6872a4d6a934f..4af3f7c17ce37 100644
--- a/lld/test/MachO/thin-archive.s
+++ b/lld/test/MachO/thin-archive.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/main.o %t/main.s
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/lib.o \

diff  --git a/lld/test/MachO/tlv-dylib.s b/lld/test/MachO/tlv-dylib.s
index 6393fe3ecd336..bb40475aa226f 100644
--- a/lld/test/MachO/tlv-dylib.s
+++ b/lld/test/MachO/tlv-dylib.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libtlv.s -o %t/libtlv.o
 # RUN: %lld -dylib -install_name @executable_path/libtlv.dylib \

diff  --git a/lld/test/MachO/u.s b/lld/test/MachO/u.s
index c6fdf3e9f2987..ff6c6d71303b7 100644
--- a/lld/test/MachO/u.s
+++ b/lld/test/MachO/u.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
 # RUN: llvm-ar csr  %t/lib.a %t/foo.o

diff  --git a/lld/test/MachO/weak-binding.s b/lld/test/MachO/weak-binding.s
index d922d36021313..0b66a18c212f1 100644
--- a/lld/test/MachO/weak-binding.s
+++ b/lld/test/MachO/weak-binding.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# 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
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libfoo.s -o %t/libfoo.o
 # RUN: %lld -dylib %t/libfoo.o -o %t/libfoo.dylib

diff  --git a/lld/test/MachO/weak-header-flags.s b/lld/test/MachO/weak-header-flags.s
index 6ea61af969cba..cf8c1f4bb66e2 100644
--- a/lld/test/MachO/weak-header-flags.s
+++ b/lld/test/MachO/weak-header-flags.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/libweak-defines.s -o %t/libweak-defines.o
 # RUN: %lld -dylib %t/libweak-defines.o -o %t/libweak-defines.dylib

diff  --git a/lld/test/MachO/weak-import.s b/lld/test/MachO/weak-import.s
index 6b13fcd7110b7..6051a60f1cf0d 100644
--- a/lld/test/MachO/weak-import.s
+++ b/lld/test/MachO/weak-import.s
@@ -1,5 +1,5 @@
 # REQUIRES: x86
-# RUN: split-file %s %t
+# 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
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weak-ref-only.s -o %t/weak-ref-only.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weak-ref-sub-library.s -o %t/weak-ref-sub-library.o

diff  --git a/lld/test/MachO/why-load.s b/lld/test/MachO/why-load.s
index 3dfec24b4b008..136187bf8f333 100644
--- a/lld/test/MachO/why-load.s
+++ b/lld/test/MachO/why-load.s
@@ -1,6 +1,6 @@
 # REQUIRES: x86
 # RUN: rm -rf %t
-# RUN: split-file %s %t
+# RUN: rm -rf %t; split-file %s %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/objc.o %t/objc.s
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s

More information about the llvm-commits mailing list