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

diff --git a/modules/arch/x86/tests/Makefile.inc b/modules/arch/x86/tests/Makefile.inc
index a288daaa895c4b9f741c8b62361c6806298b26d7..c1c6601e17c563cd780bddc3d888c71aaf295031 100644 (file)
--- 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 (file)
index 0000000..44f4c72
--- /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 (executable)
index 0000000..3379775
--- /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 dbe3323c73c5605a38a8604c69994ab0c07f6722..72e6f3255dd4bff687808c0b4daa04fec7758a11 100644 (file)
--- 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 (file)
index c935760..0000000
--- 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 (executable)
index 3e2226a..0000000
--- 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 $?