Merge r9550..r9552 (move seg_override and sigcontext) from the DARWIN branch.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9553

diff --git a/configure.in b/configure.in
index 91ed9767c5f710acd16b24705aca3232561f6c90..4f02b7225fed4bf31c3b6b0b6c8decd8c2721923 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1751,6 +1751,7 @@ AC_OUTPUT(
    none/tests/ppc64/Makefile
    none/tests/x86/Makefile
    none/tests/linux/Makefile
+   none/tests/x86-linux/Makefile
    none/docs/Makefile
    exp-omega/Makefile
    exp-omega/tests/Makefile

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 81cde99c4a452fa3265e5a452f21b50b976ee7b9..c7b2ef59f53f0daa462dae003ab432b7b02fd207 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -22,6 +22,11 @@ if VGCONF_OS_IS_LINUX
 SUBDIRS += linux
 endif
 
+# Platform-specific tests
+if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
+SUBDIRS += x86-linux
+endif
+
 DIST_SUBDIRS = x86 amd64 ppc32 ppc64 linux .
 
 noinst_SCRIPTS = \

diff --git a/none/tests/x86-linux/Makefile.am b/none/tests/x86-linux/Makefile.am
new file mode 100644 (file)
index 0000000..a4634da
--- /dev/null
+++ b/none/tests/x86-linux/Makefile.am
@@ -0,0 +1,19 @@
+
+include $(top_srcdir)/Makefile.tool-tests.am
+
+noinst_SCRIPTS = \
+       filter_stderr
+
+EXTRA_DIST = $(noinst_SCRIPTS) \
+       seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest \
+       sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest
+
+check_PROGRAMS = \
+       seg_override \
+       sigcontext
+
+AM_CFLAGS    += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS  += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CCASFLAGS  = @FLAG_M32@
+
+

diff --git a/none/tests/x86-linux/filter_stderr b/none/tests/x86-linux/filter_stderr
new file mode 100755 (executable)
index 0000000..616ce05
--- /dev/null
+++ b/none/tests/x86-linux/filter_stderr
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+../filter_stderr
+

diff --git a/none/tests/x86/seg_override.c b/none/tests/x86-linux/seg_override.c
similarity index 100%
rename from none/tests/x86/seg_override.c
rename to none/tests/x86-linux/seg_override.c

diff --git a/none/tests/x86/seg_override.stderr.exp b/none/tests/x86-linux/seg_override.stderr.exp
similarity index 100%
rename from none/tests/x86/seg_override.stderr.exp
rename to none/tests/x86-linux/seg_override.stderr.exp

diff --git a/none/tests/x86/seg_override.stdout.exp b/none/tests/x86-linux/seg_override.stdout.exp
similarity index 100%
rename from none/tests/x86/seg_override.stdout.exp
rename to none/tests/x86-linux/seg_override.stdout.exp

diff --git a/none/tests/x86/seg_override.vgtest b/none/tests/x86-linux/seg_override.vgtest
similarity index 100%
rename from none/tests/x86/seg_override.vgtest
rename to none/tests/x86-linux/seg_override.vgtest

diff --git a/none/tests/x86/sigcontext.c b/none/tests/x86-linux/sigcontext.c
similarity index 100%
rename from none/tests/x86/sigcontext.c
rename to none/tests/x86-linux/sigcontext.c

diff --git a/none/tests/x86/sigcontext.stderr.exp b/none/tests/x86-linux/sigcontext.stderr.exp
similarity index 100%
rename from none/tests/x86/sigcontext.stderr.exp
rename to none/tests/x86-linux/sigcontext.stderr.exp

diff --git a/none/tests/x86/sigcontext.stdout.exp b/none/tests/x86-linux/sigcontext.stdout.exp
similarity index 100%
rename from none/tests/x86/sigcontext.stdout.exp
rename to none/tests/x86-linux/sigcontext.stdout.exp

diff --git a/none/tests/x86/sigcontext.vgtest b/none/tests/x86-linux/sigcontext.vgtest
similarity index 100%
rename from none/tests/x86/sigcontext.vgtest
rename to none/tests/x86-linux/sigcontext.vgtest

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index 90a6a8adfe252020982b00bab96a90e08fdddcfe..85e40fefe956c9fadcc31ac30df40fdc5d05e15d 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -50,8 +50,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        movx.stderr.exp movx.stdout.exp movx.vgtest \
        pushpopseg.stderr.exp pushpopseg.stdout.exp pushpopseg.vgtest \
        sbbmisc.stderr.exp sbbmisc.stdout.exp sbbmisc.vgtest \
-       seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest \
-       sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest \
        smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
        ssse3_misaligned.stderr.exp ssse3_misaligned.stdout.exp \
        ssse3_misaligned.vgtest \
@@ -85,8 +83,6 @@ check_PROGRAMS = \
         movx \
         pushpopseg \
         sbbmisc \
-       seg_override \
-        sigcontext \
         smc1 \
         yield
 if BUILD_SSSE3_TESTS