From 267174e02b3c80a07bfe0133b9343ef3e8570a99 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 25 Sep 2005 20:19:05 +0000 Subject: [PATCH] Move parsers/gas/tests/amd64 to arch/x86/tests/gas64, as the tests going here are really entirely implemented in the x86 arch. After this commit, gas_amd64_test.sh needs to be renamed. svn path=/trunk/yasm/; revision=1240 --- modules/arch/x86/tests/Makefile.inc | 4 ++++ modules/arch/x86/tests/gas64/Makefile.inc | 9 +++++++++ modules/arch/x86/tests/gas64/gas_amd64_test.sh | 4 ++++ .../gas/tests/amd64 => arch/x86/tests/gas64}/riprel.asm | 0 .../tests/amd64 => arch/x86/tests/gas64}/riprel.errwarn | 0 .../gas/tests/amd64 => arch/x86/tests/gas64}/riprel.hex | 0 modules/parsers/gas/tests/Makefile.inc | 3 --- modules/parsers/gas/tests/amd64/Makefile.inc | 9 --------- modules/parsers/gas/tests/amd64/gas_amd64_test.sh | 4 ---- 9 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 modules/arch/x86/tests/gas64/Makefile.inc create mode 100755 modules/arch/x86/tests/gas64/gas_amd64_test.sh rename modules/{parsers/gas/tests/amd64 => arch/x86/tests/gas64}/riprel.asm (100%) rename modules/{parsers/gas/tests/amd64 => arch/x86/tests/gas64}/riprel.errwarn (100%) rename modules/{parsers/gas/tests/amd64 => arch/x86/tests/gas64}/riprel.hex (100%) delete mode 100644 modules/parsers/gas/tests/amd64/Makefile.inc delete mode 100755 modules/parsers/gas/tests/amd64/gas_amd64_test.sh diff --git a/modules/arch/x86/tests/Makefile.inc b/modules/arch/x86/tests/Makefile.inc index a288daaa..c1c6601e 100644 --- a/modules/arch/x86/tests/Makefile.inc +++ b/modules/arch/x86/tests/Makefile.inc @@ -156,3 +156,7 @@ EXTRA_DIST += modules/arch/x86/tests/x86label.hex EXTRA_DIST += modules/arch/x86/tests/xmm64.asm EXTRA_DIST += modules/arch/x86/tests/xmm64.errwarn EXTRA_DIST += modules/arch/x86/tests/xmm64.hex + +EXTRA_DIST += modules/arch/x86/tests/gas64/Makefile.inc + +include modules/arch/x86/tests/gas64/Makefile.inc diff --git a/modules/arch/x86/tests/gas64/Makefile.inc b/modules/arch/x86/tests/gas64/Makefile.inc new file mode 100644 index 00000000..44f4c727 --- /dev/null +++ b/modules/arch/x86/tests/gas64/Makefile.inc @@ -0,0 +1,9 @@ +# $Id$ + +TESTS += modules/arch/x86/tests/gas64/gas_amd64_test.sh + +EXTRA_DIST += modules/arch/x86/tests/gas64/gas_amd64_test.sh +EXTRA_DIST += modules/arch/x86/tests/gas64/riprel.asm +EXTRA_DIST += modules/arch/x86/tests/gas64/riprel.errwarn +EXTRA_DIST += modules/arch/x86/tests/gas64/riprel.hex + diff --git a/modules/arch/x86/tests/gas64/gas_amd64_test.sh b/modules/arch/x86/tests/gas64/gas_amd64_test.sh new file mode 100755 index 00000000..3379775c --- /dev/null +++ b/modules/arch/x86/tests/gas64/gas_amd64_test.sh @@ -0,0 +1,4 @@ +#! /bin/sh +# $Id$ +${srcdir}/out_test.sh x86_gas64_test modules/arch/x86/tests/gas64 "amd64 gas format" "-f elf -m amd64 -p gas" ".o" +exit $? diff --git a/modules/parsers/gas/tests/amd64/riprel.asm b/modules/arch/x86/tests/gas64/riprel.asm similarity index 100% rename from modules/parsers/gas/tests/amd64/riprel.asm rename to modules/arch/x86/tests/gas64/riprel.asm diff --git a/modules/parsers/gas/tests/amd64/riprel.errwarn b/modules/arch/x86/tests/gas64/riprel.errwarn similarity index 100% rename from modules/parsers/gas/tests/amd64/riprel.errwarn rename to modules/arch/x86/tests/gas64/riprel.errwarn diff --git a/modules/parsers/gas/tests/amd64/riprel.hex b/modules/arch/x86/tests/gas64/riprel.hex similarity index 100% rename from modules/parsers/gas/tests/amd64/riprel.hex rename to modules/arch/x86/tests/gas64/riprel.hex diff --git a/modules/parsers/gas/tests/Makefile.inc b/modules/parsers/gas/tests/Makefile.inc index dbe3323c..72e6f325 100644 --- a/modules/parsers/gas/tests/Makefile.inc +++ b/modules/parsers/gas/tests/Makefile.inc @@ -18,6 +18,3 @@ EXTRA_DIST += modules/parsers/gas/tests/reggroup.asm EXTRA_DIST += modules/parsers/gas/tests/reggroup.errwarn EXTRA_DIST += modules/parsers/gas/tests/reggroup.hex -EXTRA_DIST += modules/parsers/gas/tests/amd64/Makefile.inc - -include modules/parsers/gas/tests/amd64/Makefile.inc diff --git a/modules/parsers/gas/tests/amd64/Makefile.inc b/modules/parsers/gas/tests/amd64/Makefile.inc deleted file mode 100644 index c9357602..00000000 --- a/modules/parsers/gas/tests/amd64/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -# $Id$ - -TESTS += modules/parsers/gas/tests/amd64/gas_amd64_test.sh - -EXTRA_DIST += modules/parsers/gas/tests/amd64/gas_amd64_test.sh -EXTRA_DIST += modules/parsers/gas/tests/amd64/riprel.asm -EXTRA_DIST += modules/parsers/gas/tests/amd64/riprel.errwarn -EXTRA_DIST += modules/parsers/gas/tests/amd64/riprel.hex - diff --git a/modules/parsers/gas/tests/amd64/gas_amd64_test.sh b/modules/parsers/gas/tests/amd64/gas_amd64_test.sh deleted file mode 100755 index 3e2226ae..00000000 --- a/modules/parsers/gas/tests/amd64/gas_amd64_test.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -# $Id$ -${srcdir}/out_test.sh gas_amd64_test modules/parsers/gas/tests/amd64 "gas-compat parser" "-f elf -m amd64 -p gas" ".o" -exit $? -- 2.40.0