diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30768da0a7..ff662cc4d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -425,7 +425,7 @@ if(BUILD_TESTING)
   endif()
 
   if(${UNIX})
-    add_subdirectory(test/elf)
+    add_subdirectory(test)
   endif()
 endif()
 
diff --git a/test/gentoo-test.sh b/common/gentoo-test.sh
similarity index 100%
rename from test/gentoo-test.sh
rename to common/gentoo-test.sh
diff --git a/test/elf/CMakeLists.txt b/test/CMakeLists.txt
similarity index 98%
rename from test/elf/CMakeLists.txt
rename to test/CMakeLists.txt
index 69a0cdae0f..fb22c0e425 100644
--- a/test/elf/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -69,10 +69,10 @@ function(add_target ARCH TRIPLE)
   file(GLOB ALL_TESTS RELATIVE ${CMAKE_CURRENT_LIST_DIR} CONFIGURE_DEPENDS
     "*.sh")
 
-  list(FILTER ALL_TESTS EXCLUDE REGEX "_")
+  list(FILTER ALL_TESTS EXCLUDE REGEX "^arch-")
 
   file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_LIST_DIR} CONFIGURE_DEPENDS
-    "${ARCH}_*.sh")
+    "arch-${ARCH}-*.sh")
 
   list(APPEND TESTS ${ALL_TESTS})
 
diff --git a/test/elf/abs-error.sh b/test/abs-error.sh
similarity index 100%
rename from test/elf/abs-error.sh
rename to test/abs-error.sh
diff --git a/test/elf/absolute-symbols.sh b/test/absolute-symbols.sh
similarity index 100%
rename from test/elf/absolute-symbols.sh
rename to test/absolute-symbols.sh
diff --git a/test/elf/allow-multiple-definition.sh b/test/allow-multiple-definition.sh
similarity index 100%
rename from test/elf/allow-multiple-definition.sh
rename to test/allow-multiple-definition.sh
diff --git a/test/elf/ar-alignment.sh b/test/ar-alignment.sh
similarity index 100%
rename from test/elf/ar-alignment.sh
rename to test/ar-alignment.sh
diff --git a/test/elf/aarch64_range-extension-thunk-disassembly.sh b/test/arch-aarch64-range-extension-thunk-disassembly.sh
similarity index 100%
rename from test/elf/aarch64_range-extension-thunk-disassembly.sh
rename to test/arch-aarch64-range-extension-thunk-disassembly.sh
diff --git a/test/elf/aarch64_variant-pcs.sh b/test/arch-aarch64-variant-pcs.sh
similarity index 100%
rename from test/elf/aarch64_variant-pcs.sh
rename to test/arch-aarch64-variant-pcs.sh
diff --git a/test/elf/arm_abs-error.sh b/test/arch-arm-abs-error.sh
similarity index 100%
rename from test/elf/arm_abs-error.sh
rename to test/arch-arm-abs-error.sh
diff --git a/test/elf/arm_range-extension-thunk-disassembly.sh b/test/arch-arm-range-extension-thunk-disassembly.sh
similarity index 100%
rename from test/elf/arm_range-extension-thunk-disassembly.sh
rename to test/arch-arm-range-extension-thunk-disassembly.sh
diff --git a/test/elf/arm_range-extension-thunk.sh b/test/arch-arm-range-extension-thunk.sh
similarity index 100%
rename from test/elf/arm_range-extension-thunk.sh
rename to test/arch-arm-range-extension-thunk.sh
diff --git a/test/elf/arm_thumb-interwork.sh b/test/arch-arm-thumb-interwork.sh
similarity index 100%
rename from test/elf/arm_thumb-interwork.sh
rename to test/arch-arm-thumb-interwork.sh
diff --git a/test/elf/arm_tlsdesc.sh b/test/arch-arm-tlsdesc.sh
similarity index 100%
rename from test/elf/arm_tlsdesc.sh
rename to test/arch-arm-tlsdesc.sh
diff --git a/test/elf/i686_tls-module-base.sh b/test/arch-i686-tls-module-base.sh
similarity index 100%
rename from test/elf/i686_tls-module-base.sh
rename to test/arch-i686-tls-module-base.sh
diff --git a/test/elf/i686_tlsdesc.sh b/test/arch-i686-tlsdesc.sh
similarity index 100%
rename from test/elf/i686_tlsdesc.sh
rename to test/arch-i686-tlsdesc.sh
diff --git a/test/elf/loongarch64_mcmodel-extreme.sh b/test/arch-loongarch64-mcmodel-extreme.sh
similarity index 100%
rename from test/elf/loongarch64_mcmodel-extreme.sh
rename to test/arch-loongarch64-mcmodel-extreme.sh
diff --git a/test/elf/loongarch64_relax-call36.sh b/test/arch-loongarch64-relax-call36.sh
similarity index 100%
rename from test/elf/loongarch64_relax-call36.sh
rename to test/arch-loongarch64-relax-call36.sh
diff --git a/test/elf/loongarch64_relax-got-load.sh b/test/arch-loongarch64-relax-got-load.sh
similarity index 100%
rename from test/elf/loongarch64_relax-got-load.sh
rename to test/arch-loongarch64-relax-got-load.sh
diff --git a/test/elf/loongarch64_relax-pcala-addi.sh b/test/arch-loongarch64-relax-pcala-addi.sh
similarity index 100%
rename from test/elf/loongarch64_relax-pcala-addi.sh
rename to test/arch-loongarch64-relax-pcala-addi.sh
diff --git a/test/elf/ppc64le_save_restore_gprs.sh b/test/arch-ppc64le-save-restore-gprs.sh
similarity index 100%
rename from test/elf/ppc64le_save_restore_gprs.sh
rename to test/arch-ppc64le-save-restore-gprs.sh
diff --git a/test/elf/riscv64_attributes.sh b/test/arch-riscv64-attributes.sh
similarity index 100%
rename from test/elf/riscv64_attributes.sh
rename to test/arch-riscv64-attributes.sh
diff --git a/test/elf/riscv64_attributes2.sh b/test/arch-riscv64-attributes2.sh
similarity index 100%
rename from test/elf/riscv64_attributes2.sh
rename to test/arch-riscv64-attributes2.sh
diff --git a/test/elf/riscv64_global-pointer-dso.sh b/test/arch-riscv64-global-pointer-dso.sh
similarity index 100%
rename from test/elf/riscv64_global-pointer-dso.sh
rename to test/arch-riscv64-global-pointer-dso.sh
diff --git a/test/elf/riscv64_global-pointer.sh b/test/arch-riscv64-global-pointer.sh
similarity index 100%
rename from test/elf/riscv64_global-pointer.sh
rename to test/arch-riscv64-global-pointer.sh
diff --git a/test/elf/riscv64_norvc.sh b/test/arch-riscv64-norvc.sh
similarity index 100%
rename from test/elf/riscv64_norvc.sh
rename to test/arch-riscv64-norvc.sh
diff --git a/test/elf/riscv64_obj-compatible.sh b/test/arch-riscv64-obj-compatible.sh
similarity index 100%
rename from test/elf/riscv64_obj-compatible.sh
rename to test/arch-riscv64-obj-compatible.sh
diff --git a/test/elf/riscv64_relax-got.sh b/test/arch-riscv64-relax-got.sh
similarity index 100%
rename from test/elf/riscv64_relax-got.sh
rename to test/arch-riscv64-relax-got.sh
diff --git a/test/elf/riscv64_relax-hi20.sh b/test/arch-riscv64-relax-hi20.sh
similarity index 100%
rename from test/elf/riscv64_relax-hi20.sh
rename to test/arch-riscv64-relax-hi20.sh
diff --git a/test/elf/riscv64_weak-undef.sh b/test/arch-riscv64-weak-undef.sh
similarity index 100%
rename from test/elf/riscv64_weak-undef.sh
rename to test/arch-riscv64-weak-undef.sh
diff --git a/test/elf/s390x_got.sh b/test/arch-s390x-got.sh
similarity index 100%
rename from test/elf/s390x_got.sh
rename to test/arch-s390x-got.sh
diff --git a/test/elf/x86_64_address-equality.sh b/test/arch-x86_64-address-equality.sh
similarity index 100%
rename from test/elf/x86_64_address-equality.sh
rename to test/arch-x86_64-address-equality.sh
diff --git a/test/elf/x86_64_empty-mergeable-section.sh b/test/arch-x86_64-empty-mergeable-section.sh
similarity index 100%
rename from test/elf/x86_64_empty-mergeable-section.sh
rename to test/arch-x86_64-empty-mergeable-section.sh
diff --git a/test/elf/x86_64_emulation-deduction.sh b/test/arch-x86_64-emulation-deduction.sh
similarity index 100%
rename from test/elf/x86_64_emulation-deduction.sh
rename to test/arch-x86_64-emulation-deduction.sh
diff --git a/test/elf/x86_64_exception-mcmodel-large.sh b/test/arch-x86_64-exception-mcmodel-large.sh
similarity index 100%
rename from test/elf/x86_64_exception-mcmodel-large.sh
rename to test/arch-x86_64-exception-mcmodel-large.sh
diff --git a/test/elf/x86_64_execstack-if-needed.sh b/test/arch-x86_64-execstack-if-needed.sh
similarity index 100%
rename from test/elf/x86_64_execstack-if-needed.sh
rename to test/arch-x86_64-execstack-if-needed.sh
diff --git a/test/elf/x86_64_gnu-linkonce.sh b/test/arch-x86_64-gnu-linkonce.sh
similarity index 100%
rename from test/elf/x86_64_gnu-linkonce.sh
rename to test/arch-x86_64-gnu-linkonce.sh
diff --git a/test/elf/x86_64_gnu-retain.sh b/test/arch-x86_64-gnu-retain.sh
similarity index 100%
rename from test/elf/x86_64_gnu-retain.sh
rename to test/arch-x86_64-gnu-retain.sh
diff --git a/test/elf/x86_64_gotpcrelx.sh b/test/arch-x86_64-gotpcrelx.sh
similarity index 100%
rename from test/elf/x86_64_gotpcrelx.sh
rename to test/arch-x86_64-gotpcrelx.sh
diff --git a/test/elf/x86_64_ifunc-alias.sh b/test/arch-x86_64-ifunc-alias.sh
similarity index 100%
rename from test/elf/x86_64_ifunc-alias.sh
rename to test/arch-x86_64-ifunc-alias.sh
diff --git a/test/elf/x86_64_incompatible-libs-linker-script.sh b/test/arch-x86_64-incompatible-libs-linker-script.sh
similarity index 100%
rename from test/elf/x86_64_incompatible-libs-linker-script.sh
rename to test/arch-x86_64-incompatible-libs-linker-script.sh
diff --git a/test/elf/x86_64_incompatible-libs-linker-script2.sh b/test/arch-x86_64-incompatible-libs-linker-script2.sh
similarity index 100%
rename from test/elf/x86_64_incompatible-libs-linker-script2.sh
rename to test/arch-x86_64-incompatible-libs-linker-script2.sh
diff --git a/test/elf/x86_64_incompatible-libs.sh b/test/arch-x86_64-incompatible-libs.sh
similarity index 100%
rename from test/elf/x86_64_incompatible-libs.sh
rename to test/arch-x86_64-incompatible-libs.sh
diff --git a/test/elf/x86_64_incompatible-libs2.sh b/test/arch-x86_64-incompatible-libs2.sh
similarity index 100%
rename from test/elf/x86_64_incompatible-libs2.sh
rename to test/arch-x86_64-incompatible-libs2.sh
diff --git a/test/elf/x86_64_incompatible-obj.sh b/test/arch-x86_64-incompatible-obj.sh
similarity index 100%
rename from test/elf/x86_64_incompatible-obj.sh
rename to test/arch-x86_64-incompatible-obj.sh
diff --git a/test/elf/x86_64_init-array-readonly.sh b/test/arch-x86_64-init-array-readonly.sh
similarity index 100%
rename from test/elf/x86_64_init-array-readonly.sh
rename to test/arch-x86_64-init-array-readonly.sh
diff --git a/test/elf/x86_64_init-array.sh b/test/arch-x86_64-init-array.sh
similarity index 100%
rename from test/elf/x86_64_init-array.sh
rename to test/arch-x86_64-init-array.sh
diff --git a/test/elf/x86_64_isa-level.sh b/test/arch-x86_64-isa-level.sh
similarity index 100%
rename from test/elf/x86_64_isa-level.sh
rename to test/arch-x86_64-isa-level.sh
diff --git a/test/elf/x86_64_large-bss.sh b/test/arch-x86_64-large-bss.sh
similarity index 100%
rename from test/elf/x86_64_large-bss.sh
rename to test/arch-x86_64-large-bss.sh
diff --git a/test/elf/x86_64_mergeable-records.sh b/test/arch-x86_64-mergeable-records.sh
similarity index 100%
rename from test/elf/x86_64_mergeable-records.sh
rename to test/arch-x86_64-mergeable-records.sh
diff --git a/test/elf/x86_64_mergeable-strings-nonalloc.sh b/test/arch-x86_64-mergeable-strings-nonalloc.sh
similarity index 100%
rename from test/elf/x86_64_mergeable-strings-nonalloc.sh
rename to test/arch-x86_64-mergeable-strings-nonalloc.sh
diff --git a/test/elf/x86_64_mergeable-strings.sh b/test/arch-x86_64-mergeable-strings.sh
similarity index 100%
rename from test/elf/x86_64_mergeable-strings.sh
rename to test/arch-x86_64-mergeable-strings.sh
diff --git a/test/elf/x86_64_note-property.sh b/test/arch-x86_64-note-property.sh
similarity index 100%
rename from test/elf/x86_64_note-property.sh
rename to test/arch-x86_64-note-property.sh
diff --git a/test/elf/x86_64_note-property2.sh b/test/arch-x86_64-note-property2.sh
similarity index 100%
rename from test/elf/x86_64_note-property2.sh
rename to test/arch-x86_64-note-property2.sh
diff --git a/test/elf/x86_64_note.sh b/test/arch-x86_64-note.sh
similarity index 100%
rename from test/elf/x86_64_note.sh
rename to test/arch-x86_64-note.sh
diff --git a/test/elf/x86_64_note2.sh b/test/arch-x86_64-note2.sh
similarity index 100%
rename from test/elf/x86_64_note2.sh
rename to test/arch-x86_64-note2.sh
diff --git a/test/elf/x86_64_plt.sh b/test/arch-x86_64-plt.sh
similarity index 100%
rename from test/elf/x86_64_plt.sh
rename to test/arch-x86_64-plt.sh
diff --git a/test/elf/x86_64_preinit-array.sh b/test/arch-x86_64-preinit-array.sh
similarity index 100%
rename from test/elf/x86_64_preinit-array.sh
rename to test/arch-x86_64-preinit-array.sh
diff --git a/test/elf/x86_64_relax.sh b/test/arch-x86_64-relax.sh
similarity index 100%
rename from test/elf/x86_64_relax.sh
rename to test/arch-x86_64-relax.sh
diff --git a/test/elf/x86_64_reloc-overflow.sh b/test/arch-x86_64-reloc-overflow.sh
similarity index 100%
rename from test/elf/x86_64_reloc-overflow.sh
rename to test/arch-x86_64-reloc-overflow.sh
diff --git a/test/elf/x86_64_reloc-zero.sh b/test/arch-x86_64-reloc-zero.sh
similarity index 100%
rename from test/elf/x86_64_reloc-zero.sh
rename to test/arch-x86_64-reloc-zero.sh
diff --git a/test/elf/x86_64_reloc.sh b/test/arch-x86_64-reloc.sh
similarity index 100%
rename from test/elf/x86_64_reloc.sh
rename to test/arch-x86_64-reloc.sh
diff --git a/test/elf/x86_64_section-alignment.sh b/test/arch-x86_64-section-alignment.sh
similarity index 100%
rename from test/elf/x86_64_section-alignment.sh
rename to test/arch-x86_64-section-alignment.sh
diff --git a/test/elf/x86_64_section-name.sh b/test/arch-x86_64-section-name.sh
similarity index 100%
rename from test/elf/x86_64_section-name.sh
rename to test/arch-x86_64-section-name.sh
diff --git a/test/elf/x86_64_tls-gd-mcmodel-large.sh b/test/arch-x86_64-tls-gd-mcmodel-large.sh
similarity index 100%
rename from test/elf/x86_64_tls-gd-mcmodel-large.sh
rename to test/arch-x86_64-tls-gd-mcmodel-large.sh
diff --git a/test/elf/x86_64_tls-gd-to-ie.sh b/test/arch-x86_64-tls-gd-to-ie.sh
similarity index 100%
rename from test/elf/x86_64_tls-gd-to-ie.sh
rename to test/arch-x86_64-tls-gd-to-ie.sh
diff --git a/test/elf/x86_64_tls-large-tbss.sh b/test/arch-x86_64-tls-large-tbss.sh
similarity index 100%
rename from test/elf/x86_64_tls-large-tbss.sh
rename to test/arch-x86_64-tls-large-tbss.sh
diff --git a/test/elf/x86_64_tls-ld-mcmodel-large.sh b/test/arch-x86_64-tls-ld-mcmodel-large.sh
similarity index 100%
rename from test/elf/x86_64_tls-ld-mcmodel-large.sh
rename to test/arch-x86_64-tls-ld-mcmodel-large.sh
diff --git a/test/elf/x86_64_tls-module-base.sh b/test/arch-x86_64-tls-module-base.sh
similarity index 100%
rename from test/elf/x86_64_tls-module-base.sh
rename to test/arch-x86_64-tls-module-base.sh
diff --git a/test/elf/x86_64_tlsdesc.sh b/test/arch-x86_64-tlsdesc.sh
similarity index 100%
rename from test/elf/x86_64_tlsdesc.sh
rename to test/arch-x86_64-tlsdesc.sh
diff --git a/test/elf/x86_64_unique.sh b/test/arch-x86_64-unique.sh
similarity index 100%
rename from test/elf/x86_64_unique.sh
rename to test/arch-x86_64-unique.sh
diff --git a/test/elf/x86_64_warn-execstack.sh b/test/arch-x86_64-warn-execstack.sh
similarity index 100%
rename from test/elf/x86_64_warn-execstack.sh
rename to test/arch-x86_64-warn-execstack.sh
diff --git a/test/elf/x86_64_warn-shared-textrel.sh b/test/arch-x86_64-warn-shared-textrel.sh
similarity index 100%
rename from test/elf/x86_64_warn-shared-textrel.sh
rename to test/arch-x86_64-warn-shared-textrel.sh
diff --git a/test/elf/x86_64_warn-textrel.sh b/test/arch-x86_64-warn-textrel.sh
similarity index 100%
rename from test/elf/x86_64_warn-textrel.sh
rename to test/arch-x86_64-warn-textrel.sh
diff --git a/test/elf/x86_64_z-ibt.sh b/test/arch-x86_64-z-ibt.sh
similarity index 100%
rename from test/elf/x86_64_z-ibt.sh
rename to test/arch-x86_64-z-ibt.sh
diff --git a/test/elf/x86_64_z-ibtplt.sh b/test/arch-x86_64-z-ibtplt.sh
similarity index 100%
rename from test/elf/x86_64_z-ibtplt.sh
rename to test/arch-x86_64-z-ibtplt.sh
diff --git a/test/elf/x86_64_z-rewrite-endbr.sh b/test/arch-x86_64-z-rewrite-endbr.sh
similarity index 100%
rename from test/elf/x86_64_z-rewrite-endbr.sh
rename to test/arch-x86_64-z-rewrite-endbr.sh
diff --git a/test/elf/x86_64_z-rewrite-endbr2.sh b/test/arch-x86_64-z-rewrite-endbr2.sh
similarity index 100%
rename from test/elf/x86_64_z-rewrite-endbr2.sh
rename to test/arch-x86_64-z-rewrite-endbr2.sh
diff --git a/test/elf/x86_64_z-rewrite-endbr3.sh b/test/arch-x86_64-z-rewrite-endbr3.sh
similarity index 100%
rename from test/elf/x86_64_z-rewrite-endbr3.sh
rename to test/arch-x86_64-z-rewrite-endbr3.sh
diff --git a/test/elf/x86_64_z-shstk.sh b/test/arch-x86_64-z-shstk.sh
similarity index 100%
rename from test/elf/x86_64_z-shstk.sh
rename to test/arch-x86_64-z-shstk.sh
diff --git a/test/elf/x86_64_z-text.sh b/test/arch-x86_64-z-text.sh
similarity index 100%
rename from test/elf/x86_64_z-text.sh
rename to test/arch-x86_64-z-text.sh
diff --git a/test/elf/as-needed-dso.sh b/test/as-needed-dso.sh
similarity index 100%
rename from test/elf/as-needed-dso.sh
rename to test/as-needed-dso.sh
diff --git a/test/elf/as-needed-dso2.sh b/test/as-needed-dso2.sh
similarity index 100%
rename from test/elf/as-needed-dso2.sh
rename to test/as-needed-dso2.sh
diff --git a/test/elf/as-needed-weak.sh b/test/as-needed-weak.sh
similarity index 100%
rename from test/elf/as-needed-weak.sh
rename to test/as-needed-weak.sh
diff --git a/test/elf/as-needed.sh b/test/as-needed.sh
similarity index 100%
rename from test/elf/as-needed.sh
rename to test/as-needed.sh
diff --git a/test/elf/auxiliary.sh b/test/auxiliary.sh
similarity index 100%
rename from test/elf/auxiliary.sh
rename to test/auxiliary.sh
diff --git a/test/elf/bno-symbolic.sh b/test/bno-symbolic.sh
similarity index 100%
rename from test/elf/bno-symbolic.sh
rename to test/bno-symbolic.sh
diff --git a/test/elf/bsymbolic-functions.sh b/test/bsymbolic-functions.sh
similarity index 100%
rename from test/elf/bsymbolic-functions.sh
rename to test/bsymbolic-functions.sh
diff --git a/test/elf/bsymbolic-non-weak-functions.sh b/test/bsymbolic-non-weak-functions.sh
similarity index 100%
rename from test/elf/bsymbolic-non-weak-functions.sh
rename to test/bsymbolic-non-weak-functions.sh
diff --git a/test/elf/bsymbolic-non-weak.sh b/test/bsymbolic-non-weak.sh
similarity index 100%
rename from test/elf/bsymbolic-non-weak.sh
rename to test/bsymbolic-non-weak.sh
diff --git a/test/elf/bsymbolic.sh b/test/bsymbolic.sh
similarity index 100%
rename from test/elf/bsymbolic.sh
rename to test/bsymbolic.sh
diff --git a/test/elf/bug178.sh b/test/bug178.sh
similarity index 100%
rename from test/elf/bug178.sh
rename to test/bug178.sh
diff --git a/test/elf/build-id.sh b/test/build-id.sh
similarity index 100%
rename from test/elf/build-id.sh
rename to test/build-id.sh
diff --git a/test/elf/canonical-plt.sh b/test/canonical-plt.sh
similarity index 100%
rename from test/elf/canonical-plt.sh
rename to test/canonical-plt.sh
diff --git a/test/elf/cmdline.sh b/test/cmdline.sh
similarity index 100%
rename from test/elf/cmdline.sh
rename to test/cmdline.sh
diff --git a/test/elf/color-diagnostics.sh b/test/color-diagnostics.sh
similarity index 100%
rename from test/elf/color-diagnostics.sh
rename to test/color-diagnostics.sh
diff --git a/test/elf/comment.sh b/test/comment.sh
similarity index 100%
rename from test/elf/comment.sh
rename to test/comment.sh
diff --git a/test/elf/common-archive.sh b/test/common-archive.sh
similarity index 100%
rename from test/elf/common-archive.sh
rename to test/common-archive.sh
diff --git a/test/elf/common-ref.sh b/test/common-ref.sh
similarity index 100%
rename from test/elf/common-ref.sh
rename to test/common-ref.sh
diff --git a/test/elf/common-symbols.sh b/test/common-symbols.sh
similarity index 100%
rename from test/elf/common-symbols.sh
rename to test/common-symbols.sh
diff --git a/test/elf/common.inc b/test/common.inc
similarity index 95%
rename from test/elf/common.inc
rename to test/common.inc
index c7f74013d6..e2b0cd600b 100644
--- a/test/elf/common.inc
+++ b/test/common.inc
@@ -20,7 +20,7 @@ fi
 
 # Set tool names
 if [ -z "$TRIPLE" ]; then
-  TESTDIR=out/test/elf/$MACHINE
+  TESTDIR=out/test/$MACHINE
   CC="${TEST_CC:-cc}"
   CXX="${TEST_CXX:-c++}"
   GCC="${TEST_GCC:-gcc}"
@@ -31,7 +31,7 @@ if [ -z "$TRIPLE" ]; then
   QEMU=
 elif [ "$TRIPLE" = powerpc64le-linux-gnu -a "$CPU" = power10 ]; then
   MACHINE=ppc64le
-  TESTDIR=out/test/elf/ppc64le-power10
+  TESTDIR=out/test/ppc64le-power10
   CC="${TEST_CC:-$TRIPLE-gcc} -mcpu=power10"
   CXX="${TEST_CXX:-$TRIPLE-g++} -mcpu=power10"
   GCC="${TEST_GCC:-$TRIPLE-gcc} -mcpu=power10"
@@ -42,7 +42,7 @@ elif [ "$TRIPLE" = powerpc64le-linux-gnu -a "$CPU" = power10 ]; then
   QEMU="qemu-ppc64le -L /usr/$TRIPLE -cpu power10"
 else
   MACHINE=$(canonical_name $(echo $TRIPLE | sed 's/-.*//'))
-  TESTDIR=out/test/elf/$MACHINE
+  TESTDIR=out/test/$MACHINE
   CC="${TEST_CC:-$TRIPLE-gcc}"
   CXX="${TEST_CXX:-$TRIPLE-g++}"
   GCC="${TEST_GCC:-$TRIPLE-gcc}"
@@ -88,7 +88,7 @@ supports_tlsdesc() {
   # musl's tlsdesc on arm32 seems to be broken
   [ $MACHINE = arm ] && is_musl && return 1
 
-  [ -n "$tlsdesc_opt" ]
+  [ "$tlsdesc_opt" != '' ]
 }
 
 on_qemu() {
diff --git a/test/elf/compress-debug-sections-zstd.sh b/test/compress-debug-sections-zstd.sh
similarity index 100%
rename from test/elf/compress-debug-sections-zstd.sh
rename to test/compress-debug-sections-zstd.sh
diff --git a/test/elf/compress-debug-sections.sh b/test/compress-debug-sections.sh
similarity index 100%
rename from test/elf/compress-debug-sections.sh
rename to test/compress-debug-sections.sh
diff --git a/test/elf/compressed-debug-info.sh b/test/compressed-debug-info.sh
similarity index 100%
rename from test/elf/compressed-debug-info.sh
rename to test/compressed-debug-info.sh
diff --git a/test/elf/copyrel-alignment.sh b/test/copyrel-alignment.sh
similarity index 100%
rename from test/elf/copyrel-alignment.sh
rename to test/copyrel-alignment.sh
diff --git a/test/elf/copyrel-norelro.sh b/test/copyrel-norelro.sh
similarity index 100%
rename from test/elf/copyrel-norelro.sh
rename to test/copyrel-norelro.sh
diff --git a/test/elf/copyrel-protected.sh b/test/copyrel-protected.sh
similarity index 100%
rename from test/elf/copyrel-protected.sh
rename to test/copyrel-protected.sh
diff --git a/test/elf/copyrel-relro.sh b/test/copyrel-relro.sh
similarity index 100%
rename from test/elf/copyrel-relro.sh
rename to test/copyrel-relro.sh
diff --git a/test/elf/copyrel-relro2.sh b/test/copyrel-relro2.sh
similarity index 100%
rename from test/elf/copyrel-relro2.sh
rename to test/copyrel-relro2.sh
diff --git a/test/elf/copyrel.sh b/test/copyrel.sh
similarity index 100%
rename from test/elf/copyrel.sh
rename to test/copyrel.sh
diff --git a/test/elf/ctors-in-init-array.sh b/test/ctors-in-init-array.sh
similarity index 100%
rename from test/elf/ctors-in-init-array.sh
rename to test/ctors-in-init-array.sh
diff --git a/test/elf/dead-debug-sections.sh b/test/dead-debug-sections.sh
similarity index 100%
rename from test/elf/dead-debug-sections.sh
rename to test/dead-debug-sections.sh
diff --git a/test/elf/debug-macro-section.sh b/test/debug-macro-section.sh
similarity index 100%
rename from test/elf/debug-macro-section.sh
rename to test/debug-macro-section.sh
diff --git a/test/elf/default-symver.sh b/test/default-symver.sh
similarity index 100%
rename from test/elf/default-symver.sh
rename to test/default-symver.sh
diff --git a/test/elf/defsym-lto.sh b/test/defsym-lto.sh
similarity index 100%
rename from test/elf/defsym-lto.sh
rename to test/defsym-lto.sh
diff --git a/test/elf/defsym-missing-symbol.sh b/test/defsym-missing-symbol.sh
similarity index 100%
rename from test/elf/defsym-missing-symbol.sh
rename to test/defsym-missing-symbol.sh
diff --git a/test/elf/defsym.sh b/test/defsym.sh
similarity index 100%
rename from test/elf/defsym.sh
rename to test/defsym.sh
diff --git a/test/elf/defsym2.sh b/test/defsym2.sh
similarity index 100%
rename from test/elf/defsym2.sh
rename to test/defsym2.sh
diff --git a/test/elf/demangle-cpp.sh b/test/demangle-cpp.sh
similarity index 100%
rename from test/elf/demangle-cpp.sh
rename to test/demangle-cpp.sh
diff --git a/test/elf/demangle-rust.sh b/test/demangle-rust.sh
similarity index 100%
rename from test/elf/demangle-rust.sh
rename to test/demangle-rust.sh
diff --git a/test/elf/demangle.sh b/test/demangle.sh
similarity index 100%
rename from test/elf/demangle.sh
rename to test/demangle.sh
diff --git a/test/elf/dependency-file-response-file.sh b/test/dependency-file-response-file.sh
similarity index 100%
rename from test/elf/dependency-file-response-file.sh
rename to test/dependency-file-response-file.sh
diff --git a/test/elf/dependency-file.sh b/test/dependency-file.sh
similarity index 100%
rename from test/elf/dependency-file.sh
rename to test/dependency-file.sh
diff --git a/test/elf/disable-new-dtags.sh b/test/disable-new-dtags.sh
similarity index 100%
rename from test/elf/disable-new-dtags.sh
rename to test/disable-new-dtags.sh
diff --git a/test/elf/discard.sh b/test/discard.sh
similarity index 100%
rename from test/elf/discard.sh
rename to test/discard.sh
diff --git a/test/elf/dso-undef.sh b/test/dso-undef.sh
similarity index 100%
rename from test/elf/dso-undef.sh
rename to test/dso-undef.sh
diff --git a/test/elf/dt-init.sh b/test/dt-init.sh
similarity index 100%
rename from test/elf/dt-init.sh
rename to test/dt-init.sh
diff --git a/test/elf/dt-needed.sh b/test/dt-needed.sh
similarity index 100%
rename from test/elf/dt-needed.sh
rename to test/dt-needed.sh
diff --git a/test/elf/duplicate-error-archive.sh b/test/duplicate-error-archive.sh
similarity index 100%
rename from test/elf/duplicate-error-archive.sh
rename to test/duplicate-error-archive.sh
diff --git a/test/elf/duplicate-error.sh b/test/duplicate-error.sh
similarity index 100%
rename from test/elf/duplicate-error.sh
rename to test/duplicate-error.sh
diff --git a/test/elf/dynamic-dt-debug.sh b/test/dynamic-dt-debug.sh
similarity index 100%
rename from test/elf/dynamic-dt-debug.sh
rename to test/dynamic-dt-debug.sh
diff --git a/test/elf/dynamic-linker.sh b/test/dynamic-linker.sh
similarity index 100%
rename from test/elf/dynamic-linker.sh
rename to test/dynamic-linker.sh
diff --git a/test/elf/dynamic-list-data.sh b/test/dynamic-list-data.sh
similarity index 100%
rename from test/elf/dynamic-list-data.sh
rename to test/dynamic-list-data.sh
diff --git a/test/elf/dynamic-list.sh b/test/dynamic-list.sh
similarity index 100%
rename from test/elf/dynamic-list.sh
rename to test/dynamic-list.sh
diff --git a/test/elf/dynamic-list2.sh b/test/dynamic-list2.sh
similarity index 100%
rename from test/elf/dynamic-list2.sh
rename to test/dynamic-list2.sh
diff --git a/test/elf/dynamic-list3.sh b/test/dynamic-list3.sh
similarity index 100%
rename from test/elf/dynamic-list3.sh
rename to test/dynamic-list3.sh
diff --git a/test/elf/dynamic-list4.sh b/test/dynamic-list4.sh
similarity index 100%
rename from test/elf/dynamic-list4.sh
rename to test/dynamic-list4.sh
diff --git a/test/elf/dynamic.sh b/test/dynamic.sh
similarity index 100%
rename from test/elf/dynamic.sh
rename to test/dynamic.sh
diff --git a/test/elf/emit-relocs-cpp.sh b/test/emit-relocs-cpp.sh
similarity index 100%
rename from test/elf/emit-relocs-cpp.sh
rename to test/emit-relocs-cpp.sh
diff --git a/test/elf/emit-relocs-dead-sections.sh b/test/emit-relocs-dead-sections.sh
similarity index 100%
rename from test/elf/emit-relocs-dead-sections.sh
rename to test/emit-relocs-dead-sections.sh
diff --git a/test/elf/emit-relocs.sh b/test/emit-relocs.sh
similarity index 100%
rename from test/elf/emit-relocs.sh
rename to test/emit-relocs.sh
diff --git a/test/elf/empty-arg.sh b/test/empty-arg.sh
similarity index 100%
rename from test/elf/empty-arg.sh
rename to test/empty-arg.sh
diff --git a/test/elf/empty-file.sh b/test/empty-file.sh
similarity index 100%
rename from test/elf/empty-file.sh
rename to test/empty-file.sh
diff --git a/test/elf/empty-input.sh b/test/empty-input.sh
similarity index 100%
rename from test/elf/empty-input.sh
rename to test/empty-input.sh
diff --git a/test/elf/empty-version.sh b/test/empty-version.sh
similarity index 100%
rename from test/elf/empty-version.sh
rename to test/empty-version.sh
diff --git a/test/elf/entry.sh b/test/entry.sh
similarity index 100%
rename from test/elf/entry.sh
rename to test/entry.sh
diff --git a/test/elf/exception-multiple-ehframe.sh b/test/exception-multiple-ehframe.sh
similarity index 100%
rename from test/elf/exception-multiple-ehframe.sh
rename to test/exception-multiple-ehframe.sh
diff --git a/test/elf/exception.sh b/test/exception.sh
similarity index 100%
rename from test/elf/exception.sh
rename to test/exception.sh
diff --git a/test/elf/exclude-libs.sh b/test/exclude-libs.sh
similarity index 100%
rename from test/elf/exclude-libs.sh
rename to test/exclude-libs.sh
diff --git a/test/elf/exclude-libs2.sh b/test/exclude-libs2.sh
similarity index 100%
rename from test/elf/exclude-libs2.sh
rename to test/exclude-libs2.sh
diff --git a/test/elf/exclude-libs3.sh b/test/exclude-libs3.sh
similarity index 100%
rename from test/elf/exclude-libs3.sh
rename to test/exclude-libs3.sh
diff --git a/test/elf/execstack.sh b/test/execstack.sh
similarity index 100%
rename from test/elf/execstack.sh
rename to test/execstack.sh
diff --git a/test/elf/execute-only.sh b/test/execute-only.sh
similarity index 100%
rename from test/elf/execute-only.sh
rename to test/execute-only.sh
diff --git a/test/elf/export-dynamic.sh b/test/export-dynamic.sh
similarity index 100%
rename from test/elf/export-dynamic.sh
rename to test/export-dynamic.sh
diff --git a/test/elf/export-from-exe.sh b/test/export-from-exe.sh
similarity index 100%
rename from test/elf/export-from-exe.sh
rename to test/export-from-exe.sh
diff --git a/test/elf/fatal-warnings.sh b/test/fatal-warnings.sh
similarity index 100%
rename from test/elf/fatal-warnings.sh
rename to test/fatal-warnings.sh
diff --git a/test/elf/filler.sh b/test/filler.sh
similarity index 100%
rename from test/elf/filler.sh
rename to test/filler.sh
diff --git a/test/elf/filter.sh b/test/filter.sh
similarity index 100%
rename from test/elf/filter.sh
rename to test/filter.sh
diff --git a/test/elf/func-addr.sh b/test/func-addr.sh
similarity index 100%
rename from test/elf/func-addr.sh
rename to test/func-addr.sh
diff --git a/test/elf/gc-sections.sh b/test/gc-sections.sh
similarity index 100%
rename from test/elf/gc-sections.sh
rename to test/gc-sections.sh
diff --git a/test/elf/gdb-index-compress-output.sh b/test/gdb-index-compress-output.sh
similarity index 100%
rename from test/elf/gdb-index-compress-output.sh
rename to test/gdb-index-compress-output.sh
diff --git a/test/elf/gdb-index-dwarf2.sh b/test/gdb-index-dwarf2.sh
similarity index 100%
rename from test/elf/gdb-index-dwarf2.sh
rename to test/gdb-index-dwarf2.sh
diff --git a/test/elf/gdb-index-dwarf3.sh b/test/gdb-index-dwarf3.sh
similarity index 100%
rename from test/elf/gdb-index-dwarf3.sh
rename to test/gdb-index-dwarf3.sh
diff --git a/test/elf/gdb-index-dwarf4.sh b/test/gdb-index-dwarf4.sh
similarity index 100%
rename from test/elf/gdb-index-dwarf4.sh
rename to test/gdb-index-dwarf4.sh
diff --git a/test/elf/gdb-index-dwarf5.sh b/test/gdb-index-dwarf5.sh
similarity index 100%
rename from test/elf/gdb-index-dwarf5.sh
rename to test/gdb-index-dwarf5.sh
diff --git a/test/elf/gdb-index-dwarf64.sh b/test/gdb-index-dwarf64.sh
similarity index 100%
rename from test/elf/gdb-index-dwarf64.sh
rename to test/gdb-index-dwarf64.sh
diff --git a/test/elf/gdb-index-empty.sh b/test/gdb-index-empty.sh
similarity index 100%
rename from test/elf/gdb-index-empty.sh
rename to test/gdb-index-empty.sh
diff --git a/test/elf/gdb-index-split-dwarf.sh b/test/gdb-index-split-dwarf.sh
similarity index 100%
rename from test/elf/gdb-index-split-dwarf.sh
rename to test/gdb-index-split-dwarf.sh
diff --git a/test/elf/glibc-2.22-bug.sh b/test/glibc-2.22-bug.sh
similarity index 100%
rename from test/elf/glibc-2.22-bug.sh
rename to test/glibc-2.22-bug.sh
diff --git a/test/elf/global-offset-table.sh b/test/global-offset-table.sh
similarity index 100%
rename from test/elf/global-offset-table.sh
rename to test/global-offset-table.sh
diff --git a/test/elf/gnu-hash.sh b/test/gnu-hash.sh
similarity index 100%
rename from test/elf/gnu-hash.sh
rename to test/gnu-hash.sh
diff --git a/test/elf/gnu-retain.sh b/test/gnu-retain.sh
similarity index 100%
rename from test/elf/gnu-retain.sh
rename to test/gnu-retain.sh
diff --git a/test/elf/gnu-unique.sh b/test/gnu-unique.sh
similarity index 100%
rename from test/elf/gnu-unique.sh
rename to test/gnu-unique.sh
diff --git a/test/elf/gnu-warning.sh b/test/gnu-warning.sh
similarity index 100%
rename from test/elf/gnu-warning.sh
rename to test/gnu-warning.sh
diff --git a/test/elf/hash-style.sh b/test/hash-style.sh
similarity index 100%
rename from test/elf/hash-style.sh
rename to test/hash-style.sh
diff --git a/test/elf/hello-dynamic.sh b/test/hello-dynamic.sh
similarity index 100%
rename from test/elf/hello-dynamic.sh
rename to test/hello-dynamic.sh
diff --git a/test/elf/hello-static.sh b/test/hello-static.sh
similarity index 100%
rename from test/elf/hello-static.sh
rename to test/hello-static.sh
diff --git a/test/elf/help.sh b/test/help.sh
similarity index 100%
rename from test/elf/help.sh
rename to test/help.sh
diff --git a/test/elf/hidden-undef.sh b/test/hidden-undef.sh
similarity index 100%
rename from test/elf/hidden-undef.sh
rename to test/hidden-undef.sh
diff --git a/test/elf/hidden-weak-undef.sh b/test/hidden-weak-undef.sh
similarity index 100%
rename from test/elf/hidden-weak-undef.sh
rename to test/hidden-weak-undef.sh
diff --git a/test/elf/icf-safe.sh b/test/icf-safe.sh
similarity index 100%
rename from test/elf/icf-safe.sh
rename to test/icf-safe.sh
diff --git a/test/elf/icf-small.sh b/test/icf-small.sh
similarity index 100%
rename from test/elf/icf-small.sh
rename to test/icf-small.sh
diff --git a/test/elf/icf.sh b/test/icf.sh
similarity index 100%
rename from test/elf/icf.sh
rename to test/icf.sh
diff --git a/test/elf/ifunc-address-equality-exported.sh b/test/ifunc-address-equality-exported.sh
similarity index 100%
rename from test/elf/ifunc-address-equality-exported.sh
rename to test/ifunc-address-equality-exported.sh
diff --git a/test/elf/ifunc-address-equality.sh b/test/ifunc-address-equality.sh
similarity index 100%
rename from test/elf/ifunc-address-equality.sh
rename to test/ifunc-address-equality.sh
diff --git a/test/elf/ifunc-alias.sh b/test/ifunc-alias.sh
similarity index 100%
rename from test/elf/ifunc-alias.sh
rename to test/ifunc-alias.sh
diff --git a/test/elf/ifunc-dlopen.sh b/test/ifunc-dlopen.sh
similarity index 100%
rename from test/elf/ifunc-dlopen.sh
rename to test/ifunc-dlopen.sh
diff --git a/test/elf/ifunc-dso.sh b/test/ifunc-dso.sh
similarity index 100%
rename from test/elf/ifunc-dso.sh
rename to test/ifunc-dso.sh
diff --git a/test/elf/ifunc-dynamic.sh b/test/ifunc-dynamic.sh
similarity index 100%
rename from test/elf/ifunc-dynamic.sh
rename to test/ifunc-dynamic.sh
diff --git a/test/elf/ifunc-export.sh b/test/ifunc-export.sh
similarity index 100%
rename from test/elf/ifunc-export.sh
rename to test/ifunc-export.sh
diff --git a/test/elf/ifunc-funcptr.sh b/test/ifunc-funcptr.sh
similarity index 100%
rename from test/elf/ifunc-funcptr.sh
rename to test/ifunc-funcptr.sh
diff --git a/test/elf/ifunc-noplt.sh b/test/ifunc-noplt.sh
similarity index 100%
rename from test/elf/ifunc-noplt.sh
rename to test/ifunc-noplt.sh
diff --git a/test/elf/ifunc-static-pie.sh b/test/ifunc-static-pie.sh
similarity index 100%
rename from test/elf/ifunc-static-pie.sh
rename to test/ifunc-static-pie.sh
diff --git a/test/elf/ifunc-static.sh b/test/ifunc-static.sh
similarity index 100%
rename from test/elf/ifunc-static.sh
rename to test/ifunc-static.sh
diff --git a/test/elf/image-base.sh b/test/image-base.sh
similarity index 100%
rename from test/elf/image-base.sh
rename to test/image-base.sh
diff --git a/test/elf/init-array-priorities.sh b/test/init-array-priorities.sh
similarity index 100%
rename from test/elf/init-array-priorities.sh
rename to test/init-array-priorities.sh
diff --git a/test/elf/init-in-dso.sh b/test/init-in-dso.sh
similarity index 100%
rename from test/elf/init-in-dso.sh
rename to test/init-in-dso.sh
diff --git a/test/elf/init.sh b/test/init.sh
similarity index 100%
rename from test/elf/init.sh
rename to test/init.sh
diff --git a/test/elf/initfirst.sh b/test/initfirst.sh
similarity index 100%
rename from test/elf/initfirst.sh
rename to test/initfirst.sh
diff --git a/test/elf/interpose.sh b/test/interpose.sh
similarity index 100%
rename from test/elf/interpose.sh
rename to test/interpose.sh
diff --git a/test/elf/invalid-version-script.sh b/test/invalid-version-script.sh
similarity index 100%
rename from test/elf/invalid-version-script.sh
rename to test/invalid-version-script.sh
diff --git a/test/elf/issue646.sh b/test/issue646.sh
similarity index 100%
rename from test/elf/issue646.sh
rename to test/issue646.sh
diff --git a/test/elf/large-alignment-dso.sh b/test/large-alignment-dso.sh
similarity index 100%
rename from test/elf/large-alignment-dso.sh
rename to test/large-alignment-dso.sh
diff --git a/test/elf/large-alignment.sh b/test/large-alignment.sh
similarity index 100%
rename from test/elf/large-alignment.sh
rename to test/large-alignment.sh
diff --git a/test/elf/large-max-page-size-strip.sh b/test/large-max-page-size-strip.sh
similarity index 100%
rename from test/elf/large-max-page-size-strip.sh
rename to test/large-max-page-size-strip.sh
diff --git a/test/elf/large-max-page-size.sh b/test/large-max-page-size.sh
similarity index 100%
rename from test/elf/large-max-page-size.sh
rename to test/large-max-page-size.sh
diff --git a/test/elf/large-text.sh b/test/large-text.sh
similarity index 100%
rename from test/elf/large-text.sh
rename to test/large-text.sh
diff --git a/test/elf/library.sh b/test/library.sh
similarity index 100%
rename from test/elf/library.sh
rename to test/library.sh
diff --git a/test/elf/link-order.sh b/test/link-order.sh
similarity index 100%
rename from test/elf/link-order.sh
rename to test/link-order.sh
diff --git a/test/elf/linker-script-defsym.sh b/test/linker-script-defsym.sh
similarity index 100%
rename from test/elf/linker-script-defsym.sh
rename to test/linker-script-defsym.sh
diff --git a/test/elf/linker-script-error.sh b/test/linker-script-error.sh
similarity index 100%
rename from test/elf/linker-script-error.sh
rename to test/linker-script-error.sh
diff --git a/test/elf/linker-script-relocatable.sh b/test/linker-script-relocatable.sh
similarity index 100%
rename from test/elf/linker-script-relocatable.sh
rename to test/linker-script-relocatable.sh
diff --git a/test/elf/linker-script.sh b/test/linker-script.sh
similarity index 100%
rename from test/elf/linker-script.sh
rename to test/linker-script.sh
diff --git a/test/elf/linker-script2.sh b/test/linker-script2.sh
similarity index 100%
rename from test/elf/linker-script2.sh
rename to test/linker-script2.sh
diff --git a/test/elf/linker-script3.sh b/test/linker-script3.sh
similarity index 100%
rename from test/elf/linker-script3.sh
rename to test/linker-script3.sh
diff --git a/test/elf/linker-script4.sh b/test/linker-script4.sh
similarity index 100%
rename from test/elf/linker-script4.sh
rename to test/linker-script4.sh
diff --git a/test/elf/linker-script5.sh b/test/linker-script5.sh
similarity index 100%
rename from test/elf/linker-script5.sh
rename to test/linker-script5.sh
diff --git a/test/elf/linker-script6.sh b/test/linker-script6.sh
similarity index 100%
rename from test/elf/linker-script6.sh
rename to test/linker-script6.sh
diff --git a/test/elf/lto-archive.sh b/test/lto-archive.sh
similarity index 100%
rename from test/elf/lto-archive.sh
rename to test/lto-archive.sh
diff --git a/test/elf/lto-archive2.sh b/test/lto-archive2.sh
similarity index 100%
rename from test/elf/lto-archive2.sh
rename to test/lto-archive2.sh
diff --git a/test/elf/lto-dso.sh b/test/lto-dso.sh
similarity index 100%
rename from test/elf/lto-dso.sh
rename to test/lto-dso.sh
diff --git a/test/elf/lto-gcc.sh b/test/lto-gcc.sh
similarity index 100%
rename from test/elf/lto-gcc.sh
rename to test/lto-gcc.sh
diff --git a/test/elf/lto-llvm.sh b/test/lto-llvm.sh
similarity index 100%
rename from test/elf/lto-llvm.sh
rename to test/lto-llvm.sh
diff --git a/test/elf/lto-nostdlib.sh b/test/lto-nostdlib.sh
similarity index 100%
rename from test/elf/lto-nostdlib.sh
rename to test/lto-nostdlib.sh
diff --git a/test/elf/lto-version-script.sh b/test/lto-version-script.sh
similarity index 100%
rename from test/elf/lto-version-script.sh
rename to test/lto-version-script.sh
diff --git a/test/elf/main-in-dso.sh b/test/main-in-dso.sh
similarity index 100%
rename from test/elf/main-in-dso.sh
rename to test/main-in-dso.sh
diff --git a/test/elf/many-sections.sh b/test/many-sections.sh
similarity index 100%
rename from test/elf/many-sections.sh
rename to test/many-sections.sh
diff --git a/test/elf/many-sections2.sh b/test/many-sections2.sh
similarity index 100%
rename from test/elf/many-sections2.sh
rename to test/many-sections2.sh
diff --git a/test/elf/mergeable-strings.sh b/test/mergeable-strings.sh
similarity index 100%
rename from test/elf/mergeable-strings.sh
rename to test/mergeable-strings.sh
diff --git a/test/elf/missing-but-ok.sh b/test/missing-but-ok.sh
similarity index 100%
rename from test/elf/missing-but-ok.sh
rename to test/missing-but-ok.sh
diff --git a/test/elf/missing-error.sh b/test/missing-error.sh
similarity index 100%
rename from test/elf/missing-error.sh
rename to test/missing-error.sh
diff --git a/test/elf/mold-wrapper.sh b/test/mold-wrapper.sh
similarity index 100%
rename from test/elf/mold-wrapper.sh
rename to test/mold-wrapper.sh
diff --git a/test/elf/mold-wrapper2.sh b/test/mold-wrapper2.sh
similarity index 100%
rename from test/elf/mold-wrapper2.sh
rename to test/mold-wrapper2.sh
diff --git a/test/elf/nmagic.sh b/test/nmagic.sh
similarity index 100%
rename from test/elf/nmagic.sh
rename to test/nmagic.sh
diff --git a/test/elf/no-allow-shlib-undefined.sh b/test/no-allow-shlib-undefined.sh
similarity index 100%
rename from test/elf/no-allow-shlib-undefined.sh
rename to test/no-allow-shlib-undefined.sh
diff --git a/test/elf/no-eh-frame-header.sh b/test/no-eh-frame-header.sh
similarity index 100%
rename from test/elf/no-eh-frame-header.sh
rename to test/no-eh-frame-header.sh
diff --git a/test/elf/no-quick-exit.sh b/test/no-quick-exit.sh
similarity index 100%
rename from test/elf/no-quick-exit.sh
rename to test/no-quick-exit.sh
diff --git a/test/elf/no-undefined-version.sh b/test/no-undefined-version.sh
similarity index 100%
rename from test/elf/no-undefined-version.sh
rename to test/no-undefined-version.sh
diff --git a/test/elf/nocopyreloc.sh b/test/nocopyreloc.sh
similarity index 100%
rename from test/elf/nocopyreloc.sh
rename to test/nocopyreloc.sh
diff --git a/test/elf/noinhibit-exec.sh b/test/noinhibit-exec.sh
similarity index 100%
rename from test/elf/noinhibit-exec.sh
rename to test/noinhibit-exec.sh
diff --git a/test/elf/non-canonical-plt.sh b/test/non-canonical-plt.sh
similarity index 100%
rename from test/elf/non-canonical-plt.sh
rename to test/non-canonical-plt.sh
diff --git a/test/elf/nostdlib.sh b/test/nostdlib.sh
similarity index 100%
rename from test/elf/nostdlib.sh
rename to test/nostdlib.sh
diff --git a/test/elf/now.sh b/test/now.sh
similarity index 100%
rename from test/elf/now.sh
rename to test/now.sh
diff --git a/test/elf/oformat-binary.sh b/test/oformat-binary.sh
similarity index 100%
rename from test/elf/oformat-binary.sh
rename to test/oformat-binary.sh
diff --git a/test/elf/omagic.sh b/test/omagic.sh
similarity index 100%
rename from test/elf/omagic.sh
rename to test/omagic.sh
diff --git a/test/elf/pack-dyn-relocs-relr.sh b/test/pack-dyn-relocs-relr.sh
similarity index 100%
rename from test/elf/pack-dyn-relocs-relr.sh
rename to test/pack-dyn-relocs-relr.sh
diff --git a/test/elf/package-metadata.sh b/test/package-metadata.sh
similarity index 100%
rename from test/elf/package-metadata.sh
rename to test/package-metadata.sh
diff --git a/test/elf/physical-image-base.sh b/test/physical-image-base.sh
similarity index 100%
rename from test/elf/physical-image-base.sh
rename to test/physical-image-base.sh
diff --git a/test/elf/pie.sh b/test/pie.sh
similarity index 100%
rename from test/elf/pie.sh
rename to test/pie.sh
diff --git a/test/elf/plt-dso.sh b/test/plt-dso.sh
similarity index 100%
rename from test/elf/plt-dso.sh
rename to test/plt-dso.sh
diff --git a/test/elf/pltgot.sh b/test/pltgot.sh
similarity index 100%
rename from test/elf/pltgot.sh
rename to test/pltgot.sh
diff --git a/test/elf/preinit-array.sh b/test/preinit-array.sh
similarity index 100%
rename from test/elf/preinit-array.sh
rename to test/preinit-array.sh
diff --git a/test/elf/print-dependencies.sh b/test/print-dependencies.sh
similarity index 100%
rename from test/elf/print-dependencies.sh
rename to test/print-dependencies.sh
diff --git a/test/elf/protected-dynsym.sh b/test/protected-dynsym.sh
similarity index 100%
rename from test/elf/protected-dynsym.sh
rename to test/protected-dynsym.sh
diff --git a/test/elf/protected.sh b/test/protected.sh
similarity index 100%
rename from test/elf/protected.sh
rename to test/protected.sh
diff --git a/test/elf/push-pop-state.sh b/test/push-pop-state.sh
similarity index 100%
rename from test/elf/push-pop-state.sh
rename to test/push-pop-state.sh
diff --git a/test/elf/range-extension-thunk.sh b/test/range-extension-thunk.sh
similarity index 100%
rename from test/elf/range-extension-thunk.sh
rename to test/range-extension-thunk.sh
diff --git a/test/elf/range-extension-thunk2.sh b/test/range-extension-thunk2.sh
similarity index 100%
rename from test/elf/range-extension-thunk2.sh
rename to test/range-extension-thunk2.sh
diff --git a/test/elf/range-extension-thunk3.sh b/test/range-extension-thunk3.sh
similarity index 100%
rename from test/elf/range-extension-thunk3.sh
rename to test/range-extension-thunk3.sh
diff --git a/test/elf/relax-got-load.sh b/test/relax-got-load.sh
similarity index 100%
rename from test/elf/relax-got-load.sh
rename to test/relax-got-load.sh
diff --git a/test/elf/reloc-rodata.sh b/test/reloc-rodata.sh
similarity index 100%
rename from test/elf/reloc-rodata.sh
rename to test/reloc-rodata.sh
diff --git a/test/elf/relocatable-archive.sh b/test/relocatable-archive.sh
similarity index 100%
rename from test/elf/relocatable-archive.sh
rename to test/relocatable-archive.sh
diff --git a/test/elf/relocatable-c++.sh b/test/relocatable-c++.sh
similarity index 100%
rename from test/elf/relocatable-c++.sh
rename to test/relocatable-c++.sh
diff --git a/test/elf/relocatable-compressed-debug-info.sh b/test/relocatable-compressed-debug-info.sh
similarity index 100%
rename from test/elf/relocatable-compressed-debug-info.sh
rename to test/relocatable-compressed-debug-info.sh
diff --git a/test/elf/relocatable-debug-info.sh b/test/relocatable-debug-info.sh
similarity index 100%
rename from test/elf/relocatable-debug-info.sh
rename to test/relocatable-debug-info.sh
diff --git a/test/elf/relocatable-exception.sh b/test/relocatable-exception.sh
similarity index 100%
rename from test/elf/relocatable-exception.sh
rename to test/relocatable-exception.sh
diff --git a/test/elf/relocatable-many-sections.sh b/test/relocatable-many-sections.sh
similarity index 100%
rename from test/elf/relocatable-many-sections.sh
rename to test/relocatable-many-sections.sh
diff --git a/test/elf/relocatable-merge-sections.sh b/test/relocatable-merge-sections.sh
similarity index 100%
rename from test/elf/relocatable-merge-sections.sh
rename to test/relocatable-merge-sections.sh
diff --git a/test/elf/relocatable-mergeable-sections.sh b/test/relocatable-mergeable-sections.sh
similarity index 100%
rename from test/elf/relocatable-mergeable-sections.sh
rename to test/relocatable-mergeable-sections.sh
diff --git a/test/elf/relocatable.sh b/test/relocatable.sh
similarity index 100%
rename from test/elf/relocatable.sh
rename to test/relocatable.sh
diff --git a/test/elf/relro.sh b/test/relro.sh
similarity index 100%
rename from test/elf/relro.sh
rename to test/relro.sh
diff --git a/test/elf/repro.sh b/test/repro.sh
similarity index 100%
rename from test/elf/repro.sh
rename to test/repro.sh
diff --git a/test/elf/require-defined.sh b/test/require-defined.sh
similarity index 100%
rename from test/elf/require-defined.sh
rename to test/require-defined.sh
diff --git a/test/elf/response-file.sh b/test/response-file.sh
similarity index 100%
rename from test/elf/response-file.sh
rename to test/response-file.sh
diff --git a/test/elf/response-file2.sh b/test/response-file2.sh
similarity index 100%
rename from test/elf/response-file2.sh
rename to test/response-file2.sh
diff --git a/test/elf/retain-symbols-file.sh b/test/retain-symbols-file.sh
similarity index 100%
rename from test/elf/retain-symbols-file.sh
rename to test/retain-symbols-file.sh
diff --git a/test/elf/reverse-sections.sh b/test/reverse-sections.sh
similarity index 100%
rename from test/elf/reverse-sections.sh
rename to test/reverse-sections.sh
diff --git a/test/elf/rodata-name.sh b/test/rodata-name.sh
similarity index 100%
rename from test/elf/rodata-name.sh
rename to test/rodata-name.sh
diff --git a/test/elf/rosegment.sh b/test/rosegment.sh
similarity index 100%
rename from test/elf/rosegment.sh
rename to test/rosegment.sh
diff --git a/test/elf/rpath.sh b/test/rpath.sh
similarity index 100%
rename from test/elf/rpath.sh
rename to test/rpath.sh
diff --git a/test/elf/run-clang.sh b/test/run-clang.sh
similarity index 100%
rename from test/elf/run-clang.sh
rename to test/run-clang.sh
diff --git a/test/elf/run.sh b/test/run.sh
similarity index 100%
rename from test/elf/run.sh
rename to test/run.sh
diff --git a/test/elf/section-align.sh b/test/section-align.sh
similarity index 100%
rename from test/elf/section-align.sh
rename to test/section-align.sh
diff --git a/test/elf/section-attributes.sh b/test/section-attributes.sh
similarity index 100%
rename from test/elf/section-attributes.sh
rename to test/section-attributes.sh
diff --git a/test/elf/section-order.sh b/test/section-order.sh
similarity index 100%
rename from test/elf/section-order.sh
rename to test/section-order.sh
diff --git a/test/elf/section-start.sh b/test/section-start.sh
similarity index 100%
rename from test/elf/section-start.sh
rename to test/section-start.sh
diff --git a/test/elf/separate-debug-file.sh b/test/separate-debug-file.sh
similarity index 100%
rename from test/elf/separate-debug-file.sh
rename to test/separate-debug-file.sh
diff --git a/test/elf/shared-abs-sym.sh b/test/shared-abs-sym.sh
similarity index 100%
rename from test/elf/shared-abs-sym.sh
rename to test/shared-abs-sym.sh
diff --git a/test/elf/shared.sh b/test/shared.sh
similarity index 100%
rename from test/elf/shared.sh
rename to test/shared.sh
diff --git a/test/elf/shuffle-sections-seed.sh b/test/shuffle-sections-seed.sh
similarity index 100%
rename from test/elf/shuffle-sections-seed.sh
rename to test/shuffle-sections-seed.sh
diff --git a/test/elf/shuffle-sections.sh b/test/shuffle-sections.sh
similarity index 100%
rename from test/elf/shuffle-sections.sh
rename to test/shuffle-sections.sh
diff --git a/test/elf/soname.sh b/test/soname.sh
similarity index 100%
rename from test/elf/soname.sh
rename to test/soname.sh
diff --git a/test/elf/spare-program-headers.sh b/test/spare-program-headers.sh
similarity index 100%
rename from test/elf/spare-program-headers.sh
rename to test/spare-program-headers.sh
diff --git a/test/elf/start-lib.sh b/test/start-lib.sh
similarity index 100%
rename from test/elf/start-lib.sh
rename to test/start-lib.sh
diff --git a/test/elf/start-stop-symbol.sh b/test/start-stop-symbol.sh
similarity index 100%
rename from test/elf/start-stop-symbol.sh
rename to test/start-stop-symbol.sh
diff --git a/test/elf/start-stop.sh b/test/start-stop.sh
similarity index 100%
rename from test/elf/start-stop.sh
rename to test/start-stop.sh
diff --git a/test/elf/static-archive.sh b/test/static-archive.sh
similarity index 100%
rename from test/elf/static-archive.sh
rename to test/static-archive.sh
diff --git a/test/elf/static-pie.sh b/test/static-pie.sh
similarity index 100%
rename from test/elf/static-pie.sh
rename to test/static-pie.sh
diff --git a/test/elf/stdout.sh b/test/stdout.sh
similarity index 100%
rename from test/elf/stdout.sh
rename to test/stdout.sh
diff --git a/test/elf/strip-debug.sh b/test/strip-debug.sh
similarity index 100%
rename from test/elf/strip-debug.sh
rename to test/strip-debug.sh
diff --git a/test/elf/strip.sh b/test/strip.sh
similarity index 100%
rename from test/elf/strip.sh
rename to test/strip.sh
diff --git a/test/elf/stt-common.sh b/test/stt-common.sh
similarity index 100%
rename from test/elf/stt-common.sh
rename to test/stt-common.sh
diff --git a/test/elf/symbol-rank.sh b/test/symbol-rank.sh
similarity index 100%
rename from test/elf/symbol-rank.sh
rename to test/symbol-rank.sh
diff --git a/test/elf/symbol-version-lto.sh b/test/symbol-version-lto.sh
similarity index 100%
rename from test/elf/symbol-version-lto.sh
rename to test/symbol-version-lto.sh
diff --git a/test/elf/symbol-version.sh b/test/symbol-version.sh
similarity index 100%
rename from test/elf/symbol-version.sh
rename to test/symbol-version.sh
diff --git a/test/elf/symbol-version2.sh b/test/symbol-version2.sh
similarity index 100%
rename from test/elf/symbol-version2.sh
rename to test/symbol-version2.sh
diff --git a/test/elf/symbol-version3.sh b/test/symbol-version3.sh
similarity index 100%
rename from test/elf/symbol-version3.sh
rename to test/symbol-version3.sh
diff --git a/test/elf/symbol-version4.sh b/test/symbol-version4.sh
similarity index 100%
rename from test/elf/symbol-version4.sh
rename to test/symbol-version4.sh
diff --git a/test/elf/symtab-dso.sh b/test/symtab-dso.sh
similarity index 100%
rename from test/elf/symtab-dso.sh
rename to test/symtab-dso.sh
diff --git a/test/elf/symtab-section-symbols.sh b/test/symtab-section-symbols.sh
similarity index 100%
rename from test/elf/symtab-section-symbols.sh
rename to test/symtab-section-symbols.sh
diff --git a/test/elf/symtab.sh b/test/symtab.sh
similarity index 100%
rename from test/elf/symtab.sh
rename to test/symtab.sh
diff --git a/test/elf/synthetic-symbols.sh b/test/synthetic-symbols.sh
similarity index 100%
rename from test/elf/synthetic-symbols.sh
rename to test/synthetic-symbols.sh
diff --git a/test/elf/sysroot-linker-script.sh b/test/sysroot-linker-script.sh
similarity index 100%
rename from test/elf/sysroot-linker-script.sh
rename to test/sysroot-linker-script.sh
diff --git a/test/elf/sysroot.sh b/test/sysroot.sh
similarity index 100%
rename from test/elf/sysroot.sh
rename to test/sysroot.sh
diff --git a/test/elf/sysroot2.sh b/test/sysroot2.sh
similarity index 100%
rename from test/elf/sysroot2.sh
rename to test/sysroot2.sh
diff --git a/test/elf/tail-call.sh b/test/tail-call.sh
similarity index 100%
rename from test/elf/tail-call.sh
rename to test/tail-call.sh
diff --git a/test/elf/tbss-only.sh b/test/tbss-only.sh
similarity index 100%
rename from test/elf/tbss-only.sh
rename to test/tbss-only.sh
diff --git a/test/elf/thin-archive.sh b/test/thin-archive.sh
similarity index 100%
rename from test/elf/thin-archive.sh
rename to test/thin-archive.sh
diff --git a/test/elf/thread-count.sh b/test/thread-count.sh
similarity index 100%
rename from test/elf/thread-count.sh
rename to test/thread-count.sh
diff --git a/test/elf/tls-alignment-multi.sh b/test/tls-alignment-multi.sh
similarity index 100%
rename from test/elf/tls-alignment-multi.sh
rename to test/tls-alignment-multi.sh
diff --git a/test/elf/tls-common.sh b/test/tls-common.sh
similarity index 100%
rename from test/elf/tls-common.sh
rename to test/tls-common.sh
diff --git a/test/elf/tls-df-static-tls.sh b/test/tls-df-static-tls.sh
similarity index 100%
rename from test/elf/tls-df-static-tls.sh
rename to test/tls-df-static-tls.sh
diff --git a/test/elf/tls-dso.sh b/test/tls-dso.sh
similarity index 100%
rename from test/elf/tls-dso.sh
rename to test/tls-dso.sh
diff --git a/test/elf/tls-gd-dlopen.sh b/test/tls-gd-dlopen.sh
similarity index 100%
rename from test/elf/tls-gd-dlopen.sh
rename to test/tls-gd-dlopen.sh
diff --git a/test/elf/tls-gd-noplt.sh b/test/tls-gd-noplt.sh
similarity index 100%
rename from test/elf/tls-gd-noplt.sh
rename to test/tls-gd-noplt.sh
diff --git a/test/elf/tls-gd-to-ie.sh b/test/tls-gd-to-ie.sh
similarity index 100%
rename from test/elf/tls-gd-to-ie.sh
rename to test/tls-gd-to-ie.sh
diff --git a/test/elf/tls-gd.sh b/test/tls-gd.sh
similarity index 100%
rename from test/elf/tls-gd.sh
rename to test/tls-gd.sh
diff --git a/test/elf/tls-ie.sh b/test/tls-ie.sh
similarity index 100%
rename from test/elf/tls-ie.sh
rename to test/tls-ie.sh
diff --git a/test/elf/tls-irregular-start-addr.sh b/test/tls-irregular-start-addr.sh
similarity index 100%
rename from test/elf/tls-irregular-start-addr.sh
rename to test/tls-irregular-start-addr.sh
diff --git a/test/elf/tls-large-alignment.sh b/test/tls-large-alignment.sh
similarity index 100%
rename from test/elf/tls-large-alignment.sh
rename to test/tls-large-alignment.sh
diff --git a/test/elf/tls-large-static-image.sh b/test/tls-large-static-image.sh
similarity index 100%
rename from test/elf/tls-large-static-image.sh
rename to test/tls-large-static-image.sh
diff --git a/test/elf/tls-ld-noplt.sh b/test/tls-ld-noplt.sh
similarity index 100%
rename from test/elf/tls-ld-noplt.sh
rename to test/tls-ld-noplt.sh
diff --git a/test/elf/tls-ld.sh b/test/tls-ld.sh
similarity index 100%
rename from test/elf/tls-ld.sh
rename to test/tls-ld.sh
diff --git a/test/elf/tls-le-error.sh b/test/tls-le-error.sh
similarity index 100%
rename from test/elf/tls-le-error.sh
rename to test/tls-le-error.sh
diff --git a/test/elf/tls-le.sh b/test/tls-le.sh
similarity index 100%
rename from test/elf/tls-le.sh
rename to test/tls-le.sh
diff --git a/test/elf/tls-nopic.sh b/test/tls-nopic.sh
similarity index 100%
rename from test/elf/tls-nopic.sh
rename to test/tls-nopic.sh
diff --git a/test/elf/tls-pic.sh b/test/tls-pic.sh
similarity index 100%
rename from test/elf/tls-pic.sh
rename to test/tls-pic.sh
diff --git a/test/elf/tls-small-alignment.sh b/test/tls-small-alignment.sh
similarity index 100%
rename from test/elf/tls-small-alignment.sh
rename to test/tls-small-alignment.sh
diff --git a/test/elf/tlsdesc-dlopen.sh b/test/tlsdesc-dlopen.sh
similarity index 100%
rename from test/elf/tlsdesc-dlopen.sh
rename to test/tlsdesc-dlopen.sh
diff --git a/test/elf/tlsdesc-import.sh b/test/tlsdesc-import.sh
similarity index 100%
rename from test/elf/tlsdesc-import.sh
rename to test/tlsdesc-import.sh
diff --git a/test/elf/tlsdesc-initial-exec.sh b/test/tlsdesc-initial-exec.sh
similarity index 100%
rename from test/elf/tlsdesc-initial-exec.sh
rename to test/tlsdesc-initial-exec.sh
diff --git a/test/elf/tlsdesc-local-dynamic.sh b/test/tlsdesc-local-dynamic.sh
similarity index 100%
rename from test/elf/tlsdesc-local-dynamic.sh
rename to test/tlsdesc-local-dynamic.sh
diff --git a/test/elf/tlsdesc-static.sh b/test/tlsdesc-static.sh
similarity index 100%
rename from test/elf/tlsdesc-static.sh
rename to test/tlsdesc-static.sh
diff --git a/test/elf/tlsdesc.sh b/test/tlsdesc.sh
similarity index 100%
rename from test/elf/tlsdesc.sh
rename to test/tlsdesc.sh
diff --git a/test/elf/trace-symbol-symver.sh b/test/trace-symbol-symver.sh
similarity index 100%
rename from test/elf/trace-symbol-symver.sh
rename to test/trace-symbol-symver.sh
diff --git a/test/elf/trace-symbol.sh b/test/trace-symbol.sh
similarity index 100%
rename from test/elf/trace-symbol.sh
rename to test/trace-symbol.sh
diff --git a/test/elf/trace.sh b/test/trace.sh
similarity index 100%
rename from test/elf/trace.sh
rename to test/trace.sh
diff --git a/test/elf/undefined-glob-gc-sections.sh b/test/undefined-glob-gc-sections.sh
similarity index 100%
rename from test/elf/undefined-glob-gc-sections.sh
rename to test/undefined-glob-gc-sections.sh
diff --git a/test/elf/undefined-glob.sh b/test/undefined-glob.sh
similarity index 100%
rename from test/elf/undefined-glob.sh
rename to test/undefined-glob.sh
diff --git a/test/elf/undefined.sh b/test/undefined.sh
similarity index 100%
rename from test/elf/undefined.sh
rename to test/undefined.sh
diff --git a/test/elf/undefined2.sh b/test/undefined2.sh
similarity index 100%
rename from test/elf/undefined2.sh
rename to test/undefined2.sh
diff --git a/test/elf/unkown-section-type.sh b/test/unkown-section-type.sh
similarity index 100%
rename from test/elf/unkown-section-type.sh
rename to test/unkown-section-type.sh
diff --git a/test/elf/unresolved-symbols.sh b/test/unresolved-symbols.sh
similarity index 100%
rename from test/elf/unresolved-symbols.sh
rename to test/unresolved-symbols.sh
diff --git a/test/elf/unresolved-symbols2.sh b/test/unresolved-symbols2.sh
similarity index 100%
rename from test/elf/unresolved-symbols2.sh
rename to test/unresolved-symbols2.sh
diff --git a/test/elf/verbose.sh b/test/verbose.sh
similarity index 100%
rename from test/elf/verbose.sh
rename to test/verbose.sh
diff --git a/test/elf/version-script-search-paths.sh b/test/version-script-search-paths.sh
similarity index 100%
rename from test/elf/version-script-search-paths.sh
rename to test/version-script-search-paths.sh
diff --git a/test/elf/version-script.sh b/test/version-script.sh
similarity index 100%
rename from test/elf/version-script.sh
rename to test/version-script.sh
diff --git a/test/elf/version-script10.sh b/test/version-script10.sh
similarity index 100%
rename from test/elf/version-script10.sh
rename to test/version-script10.sh
diff --git a/test/elf/version-script11.sh b/test/version-script11.sh
similarity index 100%
rename from test/elf/version-script11.sh
rename to test/version-script11.sh
diff --git a/test/elf/version-script12.sh b/test/version-script12.sh
similarity index 100%
rename from test/elf/version-script12.sh
rename to test/version-script12.sh
diff --git a/test/elf/version-script13.sh b/test/version-script13.sh
similarity index 100%
rename from test/elf/version-script13.sh
rename to test/version-script13.sh
diff --git a/test/elf/version-script14.sh b/test/version-script14.sh
similarity index 100%
rename from test/elf/version-script14.sh
rename to test/version-script14.sh
diff --git a/test/elf/version-script15.sh b/test/version-script15.sh
similarity index 100%
rename from test/elf/version-script15.sh
rename to test/version-script15.sh
diff --git a/test/elf/version-script16.sh b/test/version-script16.sh
similarity index 100%
rename from test/elf/version-script16.sh
rename to test/version-script16.sh
diff --git a/test/elf/version-script17.sh b/test/version-script17.sh
similarity index 100%
rename from test/elf/version-script17.sh
rename to test/version-script17.sh
diff --git a/test/elf/version-script18.sh b/test/version-script18.sh
similarity index 100%
rename from test/elf/version-script18.sh
rename to test/version-script18.sh
diff --git a/test/elf/version-script19.sh b/test/version-script19.sh
similarity index 100%
rename from test/elf/version-script19.sh
rename to test/version-script19.sh
diff --git a/test/elf/version-script2.sh b/test/version-script2.sh
similarity index 100%
rename from test/elf/version-script2.sh
rename to test/version-script2.sh
diff --git a/test/elf/version-script20.sh b/test/version-script20.sh
similarity index 100%
rename from test/elf/version-script20.sh
rename to test/version-script20.sh
diff --git a/test/elf/version-script21.sh b/test/version-script21.sh
similarity index 100%
rename from test/elf/version-script21.sh
rename to test/version-script21.sh
diff --git a/test/elf/version-script22.sh b/test/version-script22.sh
similarity index 100%
rename from test/elf/version-script22.sh
rename to test/version-script22.sh
diff --git a/test/elf/version-script23.sh b/test/version-script23.sh
similarity index 100%
rename from test/elf/version-script23.sh
rename to test/version-script23.sh
diff --git a/test/elf/version-script3.sh b/test/version-script3.sh
similarity index 100%
rename from test/elf/version-script3.sh
rename to test/version-script3.sh
diff --git a/test/elf/version-script4.sh b/test/version-script4.sh
similarity index 100%
rename from test/elf/version-script4.sh
rename to test/version-script4.sh
diff --git a/test/elf/version-script5.sh b/test/version-script5.sh
similarity index 100%
rename from test/elf/version-script5.sh
rename to test/version-script5.sh
diff --git a/test/elf/version-script6.sh b/test/version-script6.sh
similarity index 100%
rename from test/elf/version-script6.sh
rename to test/version-script6.sh
diff --git a/test/elf/version-script7.sh b/test/version-script7.sh
similarity index 100%
rename from test/elf/version-script7.sh
rename to test/version-script7.sh
diff --git a/test/elf/version-script8.sh b/test/version-script8.sh
similarity index 100%
rename from test/elf/version-script8.sh
rename to test/version-script8.sh
diff --git a/test/elf/version-script9.sh b/test/version-script9.sh
similarity index 100%
rename from test/elf/version-script9.sh
rename to test/version-script9.sh
diff --git a/test/elf/version.sh b/test/version.sh
similarity index 100%
rename from test/elf/version.sh
rename to test/version.sh
diff --git a/test/elf/versioned-undef.sh b/test/versioned-undef.sh
similarity index 100%
rename from test/elf/versioned-undef.sh
rename to test/versioned-undef.sh
diff --git a/test/elf/visibility.sh b/test/visibility.sh
similarity index 100%
rename from test/elf/visibility.sh
rename to test/visibility.sh
diff --git a/test/elf/warn-common.sh b/test/warn-common.sh
similarity index 100%
rename from test/elf/warn-common.sh
rename to test/warn-common.sh
diff --git a/test/elf/warn-once.sh b/test/warn-once.sh
similarity index 100%
rename from test/elf/warn-once.sh
rename to test/warn-once.sh
diff --git a/test/elf/warn-symbol-type.sh b/test/warn-symbol-type.sh
similarity index 100%
rename from test/elf/warn-symbol-type.sh
rename to test/warn-symbol-type.sh
diff --git a/test/elf/warn-unresolved-symbols.sh b/test/warn-unresolved-symbols.sh
similarity index 100%
rename from test/elf/warn-unresolved-symbols.sh
rename to test/warn-unresolved-symbols.sh
diff --git a/test/elf/weak-export-dso.sh b/test/weak-export-dso.sh
similarity index 100%
rename from test/elf/weak-export-dso.sh
rename to test/weak-export-dso.sh
diff --git a/test/elf/weak-export-dso2.sh b/test/weak-export-dso2.sh
similarity index 100%
rename from test/elf/weak-export-dso2.sh
rename to test/weak-export-dso2.sh
diff --git a/test/elf/weak-export-exe.sh b/test/weak-export-exe.sh
similarity index 100%
rename from test/elf/weak-export-exe.sh
rename to test/weak-export-exe.sh
diff --git a/test/elf/weak-undef-dso.sh b/test/weak-undef-dso.sh
similarity index 100%
rename from test/elf/weak-undef-dso.sh
rename to test/weak-undef-dso.sh
diff --git a/test/elf/weak-undef.sh b/test/weak-undef.sh
similarity index 100%
rename from test/elf/weak-undef.sh
rename to test/weak-undef.sh
diff --git a/test/elf/weak-undef2.sh b/test/weak-undef2.sh
similarity index 100%
rename from test/elf/weak-undef2.sh
rename to test/weak-undef2.sh
diff --git a/test/elf/weak-undef4.sh b/test/weak-undef4.sh
similarity index 100%
rename from test/elf/weak-undef4.sh
rename to test/weak-undef4.sh
diff --git a/test/elf/weak-undef5.sh b/test/weak-undef5.sh
similarity index 100%
rename from test/elf/weak-undef5.sh
rename to test/weak-undef5.sh
diff --git a/test/elf/whole-archive.sh b/test/whole-archive.sh
similarity index 100%
rename from test/elf/whole-archive.sh
rename to test/whole-archive.sh
diff --git a/test/elf/wrap-lto.sh b/test/wrap-lto.sh
similarity index 100%
rename from test/elf/wrap-lto.sh
rename to test/wrap-lto.sh
diff --git a/test/elf/wrap.sh b/test/wrap.sh
similarity index 100%
rename from test/elf/wrap.sh
rename to test/wrap.sh
diff --git a/test/elf/z-cet-report.sh b/test/z-cet-report.sh
similarity index 100%
rename from test/elf/z-cet-report.sh
rename to test/z-cet-report.sh
diff --git a/test/elf/z-defs.sh b/test/z-defs.sh
similarity index 100%
rename from test/elf/z-defs.sh
rename to test/z-defs.sh
diff --git a/test/elf/z-dynamic-undefined-weak.sh b/test/z-dynamic-undefined-weak.sh
similarity index 100%
rename from test/elf/z-dynamic-undefined-weak.sh
rename to test/z-dynamic-undefined-weak.sh
diff --git a/test/elf/z-max-page-size.sh b/test/z-max-page-size.sh
similarity index 100%
rename from test/elf/z-max-page-size.sh
rename to test/z-max-page-size.sh
diff --git a/test/elf/z-nodefaultlib.sh b/test/z-nodefaultlib.sh
similarity index 100%
rename from test/elf/z-nodefaultlib.sh
rename to test/z-nodefaultlib.sh
diff --git a/test/elf/z-nodump.sh b/test/z-nodump.sh
similarity index 100%
rename from test/elf/z-nodump.sh
rename to test/z-nodump.sh
diff --git a/test/elf/z-now.sh b/test/z-now.sh
similarity index 100%
rename from test/elf/z-now.sh
rename to test/z-now.sh
diff --git a/test/elf/z-origin.sh b/test/z-origin.sh
similarity index 100%
rename from test/elf/z-origin.sh
rename to test/z-origin.sh
diff --git a/test/elf/z-pack-relative-relocs.sh b/test/z-pack-relative-relocs.sh
similarity index 100%
rename from test/elf/z-pack-relative-relocs.sh
rename to test/z-pack-relative-relocs.sh
diff --git a/test/elf/z-rodynamic.sh b/test/z-rodynamic.sh
similarity index 100%
rename from test/elf/z-rodynamic.sh
rename to test/z-rodynamic.sh
diff --git a/test/elf/z-sectionheader.sh b/test/z-sectionheader.sh
similarity index 100%
rename from test/elf/z-sectionheader.sh
rename to test/z-sectionheader.sh
diff --git a/test/elf/z-separate-code.sh b/test/z-separate-code.sh
similarity index 100%
rename from test/elf/z-separate-code.sh
rename to test/z-separate-code.sh
diff --git a/test/elf/z-stack-size.sh b/test/z-stack-size.sh
similarity index 100%
rename from test/elf/z-stack-size.sh
rename to test/z-stack-size.sh
diff --git a/test/elf/z-start-stop-visibility.sh b/test/z-start-stop-visibility.sh
similarity index 100%
rename from test/elf/z-start-stop-visibility.sh
rename to test/z-start-stop-visibility.sh
diff --git a/test/elf/z-unknown.sh b/test/z-unknown.sh
similarity index 100%
rename from test/elf/z-unknown.sh
rename to test/z-unknown.sh