From 894ec4e1fd7bf54eefe6966e62861c7f63ce2c8a Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 15 Apr 2009 23:10:04 +0000
Subject: [PATCH] Merge r9550..r9552 (move seg_override and sigcontext) from
 the DARWIN branch.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9553
---
 configure.in                                  |  1 +
 none/tests/Makefile.am                        |  5 +++++
 none/tests/x86-linux/Makefile.am              | 19 +++++++++++++++++++
 none/tests/x86-linux/filter_stderr            |  4 ++++
 none/tests/{x86 => x86-linux}/seg_override.c  |  0
 .../seg_override.stderr.exp                   |  0
 .../seg_override.stdout.exp                   |  0
 .../{x86 => x86-linux}/seg_override.vgtest    |  0
 none/tests/{x86 => x86-linux}/sigcontext.c    |  0
 .../{x86 => x86-linux}/sigcontext.stderr.exp  |  0
 .../{x86 => x86-linux}/sigcontext.stdout.exp  |  0
 .../{x86 => x86-linux}/sigcontext.vgtest      |  0
 none/tests/x86/Makefile.am                    |  4 ----
 13 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 none/tests/x86-linux/Makefile.am
 create mode 100755 none/tests/x86-linux/filter_stderr
 rename none/tests/{x86 => x86-linux}/seg_override.c (100%)
 rename none/tests/{x86 => x86-linux}/seg_override.stderr.exp (100%)
 rename none/tests/{x86 => x86-linux}/seg_override.stdout.exp (100%)
 rename none/tests/{x86 => x86-linux}/seg_override.vgtest (100%)
 rename none/tests/{x86 => x86-linux}/sigcontext.c (100%)
 rename none/tests/{x86 => x86-linux}/sigcontext.stderr.exp (100%)
 rename none/tests/{x86 => x86-linux}/sigcontext.stdout.exp (100%)
 rename none/tests/{x86 => x86-linux}/sigcontext.vgtest (100%)

diff --git a/configure.in b/configure.in
index 91ed9767c..4f02b7225 100644
--- 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 81cde99c4..c7b2ef59f 100644
--- 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
index 000000000..a4634dae6
--- /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
index 000000000..616ce05e1
--- /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 90a6a8adf..85e40fefe 100644
--- 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