Simplify

2024-09-11 13:06:59 +03:00 · 2024-03-25 17:48:37 +09:00 · 2024-03-25 17:48:37 +09:00 · 0edbe29d38
commit 0edbe29d38
parent 8df5a76203
39 changed files with 0 additions and 55 deletions
--- a/test/elf/x86_64_emulation-deduction.sh
+++ b/test/elf/x86_64_emulation-deduction.sh
@ -1,9 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 cat <<EOF | $CC -o $t/a.o -c -xc -
 void _start() {}
 EOF
--- a/test/elf/x86_64_endbr.sh
+++ b/test/elf/x86_64_endbr.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip
 test_cflags -fcf-protection || skip

 cat <<EOF | $CC -o $t/a.o -c -xc - -ffunction-sections -O -fcf-protection
--- a/test/elf/x86_64_endbr2.sh
+++ b/test/elf/x86_64_endbr2.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip
 test_cflags -fcf-protection || skip

 cat <<EOF | $CC -o $t/a.o -c -xc - -fno-function-sections -O -fcf-protection
--- a/test/elf/x86_64_exception-mcmodel-large.sh
+++ b/test/elf/x86_64_exception-mcmodel-large.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CXX -c -o $t/a.o -xc++ -fPIC -
 int main() {
--- a/test/elf/x86_64_execstack-if-needed.sh
+++ b/test/elf/x86_64_execstack-if-needed.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -c -xassembler -o $t/a.o -
 .globl main
--- a/test/elf/x86_64_gnu-linkonce.sh
+++ b/test/elf/x86_64_gnu-linkonce.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -o $t/a.o -c -x assembler -
 .globl __x86.get_pc_thunk.bx
--- a/test/elf/x86_64_gnu-retain.sh
+++ b/test/elf/x86_64_gnu-retain.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 echo '.section foo,"R"' | $CC -o /dev/null -c -xassembler - 2> /dev/null || skip

--- a/test/elf/x86_64_incompatible-libs.sh
+++ b/test/elf/x86_64_incompatible-libs.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 echo 'int main() {}' | $CC -m32 -o $t/exe -xc - >& /dev/null \
  || skip
--- a/test/elf/x86_64_incompatible-libs2.sh
+++ b/test/elf/x86_64_incompatible-libs2.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 echo 'int main() {}' | $CC -m32 -o $t/exe -xc - >& /dev/null \
  || skip
--- a/test/elf/x86_64_incompatible-obj.sh
+++ b/test/elf/x86_64_incompatible-obj.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 echo 'int main() {}' | $CC -m32 -o $t/exe -xc - >& /dev/null \
  || skip
--- a/test/elf/x86_64_init-array-readonly.sh
+++ b/test/elf/x86_64_init-array-readonly.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -c -o $t/a.o -x assembler -
 .section .init_array,"aw",@init_array
--- a/test/elf/x86_64_init-array.sh
+++ b/test/elf/x86_64_init-array.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -c -o $t/a.o -x assembler -
 .globl init1, init2, fini1, fini2
--- a/test/elf/x86_64_large-bss.sh
+++ b/test/elf/x86_64_large-bss.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -o $t/a.o -c -xc - -mcmodel=large
 #include <stdio.h>
--- a/test/elf/x86_64_mergeable-records.sh
+++ b/test/elf/x86_64_mergeable-records.sh
@ -1,9 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 test_cflags -static || skip

 cat <<'EOF' | $CC -o $t/a.o -c -x assembler -
--- a/test/elf/x86_64_mergeable-strings.sh
+++ b/test/elf/x86_64_mergeable-strings.sh
@ -3,9 +3,6 @@

 test_cflags -static || skip

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 cat <<'EOF' | $CC -o $t/a.o -c -x assembler -
  .text
  .globl main
--- a/test/elf/x86_64_note-property.sh
+++ b/test/elf/x86_64_note-property.sh
@ -1,9 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 echo endbr64 | $CC -o /dev/null -c -xassembler - 2> /dev/null || skip

 $CC -fcf-protection=branch -c /dev/null -o /dev/null -xc 2> /dev/null || skip
--- a/test/elf/x86_64_note-property2.sh
+++ b/test/elf/x86_64_note-property2.sh
@ -4,9 +4,6 @@
 # OneTBB isn't tsan-clean
 nm mold | grep -q '__tsan_init' && skip

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 # Binutils 2.32 injects their own .note.gnu.property section interfering with the tests
 test_cflags -Xassembler -mx86-used-note=no && CFLAGS="-Xassembler -mx86-used-note=no" || CFLAGS=""

--- a/test/elf/x86_64_note.sh
+++ b/test/elf/x86_64_note.sh
@ -3,7 +3,6 @@

 test_cflags -static || skip

-[ $MACHINE = x86_64 ] || skip

 # Binutils 2.32 injects their own .note.gnu.property section interfering with the tests
 test_cflags -Xassembler -mx86-used-note=no && CFLAGS="-Xassembler -mx86-used-note=no" || CFLAGS=""
--- a/test/elf/x86_64_note2.sh
+++ b/test/elf/x86_64_note2.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 # Binutils 2.32 injects their own .note.gnu.property section interfering with the tests
 test_cflags -Xassembler -mx86-used-note=no && CFLAGS="-Xassembler -mx86-used-note=no" || CFLAGS=""
--- a/test/elf/x86_64_plt.sh
+++ b/test/elf/x86_64_plt.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<'EOF' | $CC -o $t/a.o -c -x assembler -
  .text
--- a/test/elf/x86_64_preinit-array.sh
+++ b/test/elf/x86_64_preinit-array.sh
@ -3,7 +3,6 @@

 is_musl && skip

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -c -o $t/a.o -x assembler -
 .globl preinit, init, fini
--- a/test/elf/x86_64_relax.sh
+++ b/test/elf/x86_64_relax.sh
@ -2,7 +2,6 @@
 . $(dirname $0)/common.inc

 # Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
 echo ret | cc -c -o /dev/null -xassembler -Wa,-mrelax-relocations=yes - 2> /dev/null || skip

 cat <<EOF | $CC -o $t/a.o -c -x assembler -Wa,-mrelax-relocations=yes -
--- a/test/elf/x86_64_reloc-overflow.sh
+++ b/test/elf/x86_64_reloc-overflow.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -o $t/a.o -c -x assembler -
  .globl foo
--- a/test/elf/x86_64_reloc-zero.sh
+++ b/test/elf/x86_64_reloc-zero.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -o $t/a.o -c -x assembler -
 foo: jmp 0
--- a/test/elf/x86_64_reloc.sh
+++ b/test/elf/x86_64_reloc.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<'EOF' | $CC -fPIC -c -o $t/a.o -x assembler -
 .data
--- a/test/elf/x86_64_section-alignment.sh
+++ b/test/elf/x86_64_section-alignment.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<'EOF' | $CC -c -o $t/a.o -xc -
 #include <stdint.h>
--- a/test/elf/x86_64_section-name.sh
+++ b/test/elf/x86_64_section-name.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<'EOF' | $CC -o $t/a.o -c -x assembler -
 .globl _start
--- a/test/elf/x86_64_tls-gd-mcmodel-large.sh
+++ b/test/elf/x86_64_tls-gd-mcmodel-large.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $GCC -mtls-dialect=gnu -fPIC -c -o $t/a.o -xc - -mcmodel=large
 #include <stdio.h>
--- a/test/elf/x86_64_tls-large-tbss.sh
+++ b/test/elf/x86_64_tls-large-tbss.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || [[ $MACHINE = riscv* ]] || skip

 cat <<EOF | $CC -c -o $t/a.o -x assembler -
 .globl x, y
--- a/test/elf/x86_64_tls-ld-mcmodel-large.sh
+++ b/test/elf/x86_64_tls-ld-mcmodel-large.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $GCC -ftls-model=local-dynamic -fPIC -c -o $t/a.o -xc - -mcmodel=large
 #include <stdio.h>
--- a/test/elf/x86_64_tls-module-base.sh
+++ b/test/elf/x86_64_tls-module-base.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -fPIC -o $t/a.o -c -xassembler -
 .globl get_foo
--- a/test/elf/x86_64_unique.sh
+++ b/test/elf/x86_64_unique.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -c -o $t/a.o -x assembler -
 .section .data.foo.1,"aw",@progbits
--- a/test/elf/x86_64_warn-execstack.sh
+++ b/test/elf/x86_64_warn-execstack.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -o $t/a.o -c -xassembler -
 .section .note.GNU-stack, "x"
--- a/test/elf/x86_64_warn-shared-textrel.sh
+++ b/test/elf/x86_64_warn-shared-textrel.sh
@ -4,9 +4,6 @@
 # Skip if libc is musl
 is_musl && skip

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 cat <<'EOF' | $CC -c -o $t/a.o -x assembler -
 .globl fn
 fn:
--- a/test/elf/x86_64_warn-textrel.sh
+++ b/test/elf/x86_64_warn-textrel.sh
@ -4,9 +4,6 @@
 # Skip if libc is musl
 is_musl && skip

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 cat <<'EOF' | $CC -c -o $t/a.o -x assembler -
 .globl fn
 fn:
--- a/test/elf/x86_64_z-ibt.sh
+++ b/test/elf/x86_64_z-ibt.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip
 echo endbr64 | $CC -o /dev/null -c -xassembler - 2> /dev/null || skip

 cat <<EOF | $CC -o $t/a.o -c -x assembler -
--- a/test/elf/x86_64_z-ibtplt.sh
+++ b/test/elf/x86_64_z-ibtplt.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip

 cat <<EOF | $CC -fPIC -o $t/a.o -c -xc -
 #include <stdio.h>
--- a/test/elf/x86_64_z-shstk.sh
+++ b/test/elf/x86_64_z-shstk.sh
@ -1,7 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/common.inc

-[ $MACHINE = x86_64 ] || skip
 echo endbr64 | $CC -o /dev/null -c -xassembler - 2> /dev/null || skip

 cat <<EOF | $CC -o $t/a.o -c -x assembler -
--- a/test/elf/x86_64_z-text.sh
+++ b/test/elf/x86_64_z-text.sh
@ -4,9 +4,6 @@
 # Skip if libc is musl
 is_musl && skip

-# Skip if target is not x86-64
-[ $MACHINE = x86_64 ] || skip
-
 cat <<'EOF' | $CC -c -o $t/a.o -x assembler -
 .globl fn1
 fn1: