Merge makefiles for tests into the main makefile

2024-10-04 08:37:28 +03:00 · 2022-07-12 21:03:54 +08:00 · 2022-07-12 21:03:54 +08:00 · ed7e7c7ae0
commit ed7e7c7ae0
parent 152ee5a261
343 changed files with 24 additions and 366 deletions
--- a/27
+++ b/27
@ -10,6 +10,12 @@ INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644

+ifeq ($(OS), Darwin)
+  TESTS := $(wildcard test/macho/*.sh)
+else
+  TESTS := $(wildcard test/elf/*.sh)
+endif
+
 D = $(DESTDIR)

 # CXX defaults to `g++`. Rewrite it with a vendor-neutral compiler
@ -155,10 +161,11 @@ $(TBB_LIB):

 test tests check: all
 ifeq ($(OS), Darwin)
-	$(MAKE) -C test -f Makefile.darwin --no-print-directory
+	@$(MAKE) $(TESTS) --no-print-directory
 else
-	$(MAKE) -C test -f Makefile.linux --no-print-directory --output-sync
+	@$(MAKE) $(TESTS) --no-print-directory --output-sync
 endif
+
 	@if test -t 1; then \
 	  printf '\e[32mPassed all tests\e[0m\n'; \
 	else \
@ -182,6 +189,20 @@ test-all: all
 	$(MAKE) test-arch TRIPLE=arm-linux-gnueabihf MACHINE=arm
 	$(MAKE) test-arch TRIPLE=riscv64-linux-gnu MACHINE=riscv64

+# macOS's GNU make hasn't been updated since 3.8.1 perhaps due a concern
+# of GPLv3. The --output-sync flag was introduced in GNU Make 4.0, so we
+# can't use that flag on macOS.
+#
+# `tail -r | tail -r` is a poor-man's way to enable full buffering on a
+# command output. `tail -r` outputs an input from the last line to the
+# first.
+$(TESTS):
+ifeq ($(OS), Darwin)
+	@set -o pipefail; ./$@ 2>&1 | tail -r | tail -r
+else
+	@./$@
+endif
+
 install: all
 	$(INSTALL) -d $D$(BINDIR)
 	$(INSTALL_PROGRAM) mold $D$(BINDIR)
@ -219,4 +240,4 @@ test-tsan:
 clean:
 	rm -rf *~ mold mold-wrapper.so out ld ld64 mold-*-linux.tar.gz

-.PHONY: all test tests check clean test-arch test-all test-asan test-ubsan test-tsan
+.PHONY: all test tests check clean test-arch test-all test-asan test-ubsan test-tsan $(TESTS)
--- a/test/Makefile.darwin
+++ b/test/Makefile.darwin
@ -1,15 +0,0 @@
-TESTS = $(wildcard macho/*.sh)
-
-test: $(TESTS)
-
-# macOS's GNU make hasn't been updated since 3.8.1 perhaps due a concern
-# of GPLv3. The --output-sync flag was introduced in GNU Make 4.0, so we
-# can't use that flag on macOS.
-#
-# `tail -r | tail -r` is a poor-man's way to enable full buffering on a
-# command output. `tail -r` outputs an input from the last line to the
-# first.
-$(TESTS):
-	@set -o pipefail; ./$@ 2>&1 | tail -r | tail -r
-
-.PHONY: test $(TESTS)
--- a/test/Makefile.linux
+++ b/test/Makefile.linux
@ -1,8 +0,0 @@
-TESTS = $(wildcard elf/*.sh)
-
-test: $(TESTS)
-
-$(TESTS):
-	@./$@
-
-.PHONY: test $(TESTS)
--- a/test/elf/absolute-symbols.sh
+++ b/test/elf/absolute-symbols.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/allow-multiple-definition.sh
+++ b/test/elf/allow-multiple-definition.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/ar-alignment.sh
+++ b/test/elf/ar-alignment.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/as-needed-weak.sh
+++ b/test/elf/as-needed-weak.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/as-needed.sh
+++ b/test/elf/as-needed.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/as-needed2.sh
+++ b/test/elf/as-needed2.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/auxiliary.sh
+++ b/test/elf/auxiliary.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/basic.sh
+++ b/test/elf/basic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/bno-symbolic.sh
+++ b/test/elf/bno-symbolic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/bsymbolic-functions.sh
+++ b/test/elf/bsymbolic-functions.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/bsymbolic.sh
+++ b/test/elf/bsymbolic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/bug178.sh
+++ b/test/elf/bug178.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/build-id.sh
+++ b/test/elf/build-id.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/canonical-plt.sh
+++ b/test/elf/canonical-plt.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/cmdline.sh
+++ b/test/elf/cmdline.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/color-diagnostics.sh
+++ b/test/elf/color-diagnostics.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/comment.sh
+++ b/test/elf/comment.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/common-archive.sh
+++ b/test/elf/common-archive.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/common-ref.sh
+++ b/test/elf/common-ref.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/common.sh
+++ b/test/elf/common.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/compress-debug-sections.sh
+++ b/test/elf/compress-debug-sections.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/compressed-debug-info-gnu.sh
+++ b/test/elf/compressed-debug-info-gnu.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/compressed-debug-info.sh
+++ b/test/elf/compressed-debug-info.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/copyrel-protected.sh
+++ b/test/elf/copyrel-protected.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/copyrel-relro.sh
+++ b/test/elf/copyrel-relro.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/copyrel.sh
+++ b/test/elf/copyrel.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dead-debug-sections.sh
+++ b/test/elf/dead-debug-sections.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/debug-macro-section.sh
+++ b/test/elf/debug-macro-section.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/default-symver.sh
+++ b/test/elf/default-symver.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/defsym.sh
+++ b/test/elf/defsym.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/demangle-rust.sh
+++ b/test/elf/demangle-rust.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/demangle.sh
+++ b/test/elf/demangle.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dependency-file.sh
+++ b/test/elf/dependency-file.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/disable-new-dtags.sh
+++ b/test/elf/disable-new-dtags.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/discard.sh
+++ b/test/elf/discard.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dso-undef.sh
+++ b/test/elf/dso-undef.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dt-init.sh
+++ b/test/elf/dt-init.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dt-needed.sh
+++ b/test/elf/dt-needed.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/duplicate-error.sh
+++ b/test/elf/duplicate-error.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dynamic-dt-debug.sh
+++ b/test/elf/dynamic-dt-debug.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dynamic-linker.sh
+++ b/test/elf/dynamic-linker.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dynamic-list.sh
+++ b/test/elf/dynamic-list.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dynamic-list2.sh
+++ b/test/elf/dynamic-list2.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/dynamic.sh
+++ b/test/elf/dynamic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/emit-relocs.sh
+++ b/test/elf/emit-relocs.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/empty-file.sh
+++ b/test/elf/empty-file.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/empty-input.sh
+++ b/test/elf/empty-input.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/empty-version.sh
+++ b/test/elf/empty-version.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/emulation-deduction.sh
+++ b/test/elf/emulation-deduction.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/entry.sh
+++ b/test/elf/entry.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/exception-mcmodel-large.sh
+++ b/test/elf/exception-mcmodel-large.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/exception.sh
+++ b/test/elf/exception.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/exclude-libs.sh
+++ b/test/elf/exclude-libs.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/exclude-libs2.sh
+++ b/test/elf/exclude-libs2.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/exclude-libs3.sh
+++ b/test/elf/exclude-libs3.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/execstack-if-needed.sh
+++ b/test/elf/execstack-if-needed.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/execstack.sh
+++ b/test/elf/execstack.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/export-dynamic.sh
+++ b/test/elf/export-dynamic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/export-from-exe.sh
+++ b/test/elf/export-from-exe.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/fatal-warnings.sh
+++ b/test/elf/fatal-warnings.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/filler.sh
+++ b/test/elf/filler.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/filter.sh
+++ b/test/elf/filter.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/func-addr.sh
+++ b/test/elf/func-addr.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gc-sections.sh
+++ b/test/elf/gc-sections.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gdb-index-compress-output.sh
+++ b/test/elf/gdb-index-compress-output.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gdb-index-dwarf2.sh
+++ b/test/elf/gdb-index-dwarf2.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gdb-index-dwarf3.sh
+++ b/test/elf/gdb-index-dwarf3.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gdb-index-dwarf4.sh
+++ b/test/elf/gdb-index-dwarf4.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gdb-index-dwarf5.sh
+++ b/test/elf/gdb-index-dwarf5.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gdb-index-empty.sh
+++ b/test/elf/gdb-index-empty.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/glibc-2.22-bug.sh
+++ b/test/elf/glibc-2.22-bug.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gnu-hash.sh
+++ b/test/elf/gnu-hash.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gnu-linkonce.sh
+++ b/test/elf/gnu-linkonce.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gnu-retain.sh
+++ b/test/elf/gnu-retain.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gnu-unique.sh
+++ b/test/elf/gnu-unique.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/gnu-warning.sh
+++ b/test/elf/gnu-warning.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/hello-dynamic.sh
+++ b/test/elf/hello-dynamic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/hello-static.sh
+++ b/test/elf/hello-static.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/help.sh
+++ b/test/elf/help.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/hidden-undef.sh
+++ b/test/elf/hidden-undef.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/icf-small.sh
+++ b/test/elf/icf-small.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/icf.sh
+++ b/test/elf/icf.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/ifunc-dso.sh
+++ b/test/elf/ifunc-dso.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/ifunc-dynamic.sh
+++ b/test/elf/ifunc-dynamic.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/ifunc-export.sh
+++ b/test/elf/ifunc-export.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/ifunc-static-pie.sh
+++ b/test/elf/ifunc-static-pie.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/ifunc-static.sh
+++ b/test/elf/ifunc-static.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/image-base.sh
+++ b/test/elf/image-base.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/incompatible-libs.sh
+++ b/test/elf/incompatible-libs.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/incompatible-libs2.sh
+++ b/test/elf/incompatible-libs2.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/incompatible-obj.sh
+++ b/test/elf/incompatible-obj.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/init-array-priorities.sh
+++ b/test/elf/init-array-priorities.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/init-array-readonly.sh
+++ b/test/elf/init-array-readonly.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/init-array.sh
+++ b/test/elf/init-array.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/init-in-dso.sh
+++ b/test/elf/init-in-dso.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/init.sh
+++ b/test/elf/init.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/test/elf/initfirst.sh
+++ b/test/elf/initfirst.sh
@ -9,7 +9,6 @@ OBJDUMP="${OBJDUMP:-objdump}"
 MACHINE="${MACHINE:-$(uname -m)}"
 testname=$(basename "$0" .sh)
 echo -n "Testing $testname ... "
-cd "$(dirname "$0")"/../..
 t=out/test/elf/$testname
 mkdir -p $t

--- a/Show More
+++ b/Show More