Create memcheck/tests/x86-linux/ and move some platform-specific tests (the

scalar* ones) into it.  Partial merge from DARWIN branch, r8943.

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

diff --git a/configure.in b/configure.in
index d81021d94bde4f9157f122a416f6f17e29c8fda5..af05dcae6bc2f8d826e68075ecdc9b909966aa27 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -401,6 +401,22 @@ case "$VG_ARCH_MAX-$VG_OS" in
         ;;
 esac
 
+# Set up VGA_<arch>.  Either one or two of these become defined.
+#
+AM_CONDITIONAL(VGA_X86,   
+               test x$VG_PLATFORM_PRI = xX86_LINUX \
+                 -o x$VG_PLATFORM_SEC = xX86_LINUX )
+AM_CONDITIONAL(VGA_AMD64, 
+               test x$VG_PLATFORM_PRI = xAMD64_LINUX )
+AM_CONDITIONAL(VGA_PPC32, 
+               test x$VG_PLATFORM_PRI = xPPC32_LINUX \ 
+                 -o x$VG_PLATFORM_SEC = xPPC32_LINUX \
+                 -o x$VG_PLATFORM_PRI = xPPC32_AIX5 \ 
+                 -o x$VG_PLATFORM_SEC = xPPC32_AIX5 )
+AM_CONDITIONAL(VGA_PPC64, 
+               test x$VG_PLATFORM_PRI = xPPC64_LINUX \
+                 -o x$VG_PLATFORM_PRI = xPPC64_AIX5 )
+
 # Set up VGP_<platform>.  Either one or two of these become defined.
 #
 AM_CONDITIONAL(VGP_X86_LINUX,   
@@ -1613,6 +1629,7 @@ AC_OUTPUT(
    memcheck/tests/ppc32/Makefile
    memcheck/tests/ppc64/Makefile
    memcheck/tests/x86/Makefile
+   memcheck/tests/x86-linux/Makefile
    memcheck/docs/Makefile
    cachegrind/Makefile
    cachegrind/tests/Makefile

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index eedbd19e701e0f23a3c34eaa35301ba673ef5bf5..020c128e6f0afabfb538724c71e1b58a87189d3b 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -3,19 +3,26 @@
 include $(top_srcdir)/Makefile.flags.am
 
 SUBDIRS = .
-if VGP_X86_LINUX
+
+# Arch-specific tests.
+if VGA_X86
 SUBDIRS += x86
 endif
-if VGP_AMD64_LINUX
+if VGA_AMD64
 SUBDIRS += amd64
 endif
-if VGP_PPC32_LINUX
+if VGA_PPC32
 SUBDIRS += ppc32
 endif
-if VGP_PPC64_LINUX
+if VGA_PPC64
 SUBDIRS += ppc64
 endif
 
+# Platform-specific tests
+if VGP_X86_LINUX
+SUBDIRS += x86-linux
+endif
+
 DIST_SUBDIRS = ${VG_ARCH_ALL} .
 
 noinst_SCRIPTS = filter_allocs filter_leak_check_size \

diff --git a/memcheck/tests/x86-linux/Makefile.am b/memcheck/tests/x86-linux/Makefile.am
new file mode 100644 (file)
index 0000000..041c8a8
--- /dev/null
+++ b/memcheck/tests/x86-linux/Makefile.am
@@ -0,0 +1,21 @@
+noinst_SCRIPTS = filter_stderr
+
+noinst_HEADERS = scalar.h
+
+EXTRA_DIST = $(noinst_SCRIPTS) \
+       scalar.stderr.exp scalar.stderr.exp2 scalar.vgtest \
+       scalar_fork.stderr.exp scalar_fork.vgtest \
+       scalar_exit_group.stderr.exp scalar_exit_group.stderr.exp2 \
+       scalar_exit_group.vgtest \
+       scalar_supp.stderr.exp scalar_supp.stderr.exp2 \
+       scalar_supp.vgtest scalar_supp.supp \
+       scalar_vfork.stderr.exp scalar_vfork.vgtest
+
+check_PROGRAMS = \
+       scalar scalar_exit_group scalar_fork scalar_supp scalar_vfork
+
+AM_CPPFLAGS  = -I$(top_srcdir)/include
+AM_CFLAGS    = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g \
+               $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS  = $(AM_CFLAGS)
+AM_CCASFLAGS = @FLAG_M32@

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

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

diff --git a/memcheck/tests/x86/scalar.h b/memcheck/tests/x86-linux/scalar.h
similarity index 100%
rename from memcheck/tests/x86/scalar.h
rename to memcheck/tests/x86-linux/scalar.h

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

diff --git a/memcheck/tests/x86/scalar.stderr.exp2 b/memcheck/tests/x86-linux/scalar.stderr.exp2
similarity index 100%
rename from memcheck/tests/x86/scalar.stderr.exp2
rename to memcheck/tests/x86-linux/scalar.stderr.exp2

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

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

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

diff --git a/memcheck/tests/x86/scalar_exit_group.stderr.exp2 b/memcheck/tests/x86-linux/scalar_exit_group.stderr.exp2
similarity index 100%
rename from memcheck/tests/x86/scalar_exit_group.stderr.exp2
rename to memcheck/tests/x86-linux/scalar_exit_group.stderr.exp2

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

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

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

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

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

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

diff --git a/memcheck/tests/x86/scalar_supp.stderr.exp2 b/memcheck/tests/x86-linux/scalar_supp.stderr.exp2
similarity index 100%
rename from memcheck/tests/x86/scalar_supp.stderr.exp2
rename to memcheck/tests/x86-linux/scalar_supp.stderr.exp2

diff --git a/memcheck/tests/x86/scalar_supp.supp b/memcheck/tests/x86-linux/scalar_supp.supp
similarity index 100%
rename from memcheck/tests/x86/scalar_supp.supp
rename to memcheck/tests/x86-linux/scalar_supp.supp

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

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

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

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

diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am
index f6241c5316be3e150cbac763592271e5195cea4f..d5bbeef3fc33527d53c832177e09b56e7f7716a0 100644 (file)
--- a/memcheck/tests/x86/Makefile.am
+++ b/memcheck/tests/x86/Makefile.am
@@ -1,7 +1,5 @@
 noinst_SCRIPTS = filter_stderr filter_pushfpopf filter_tronical
 
-noinst_HEADERS = scalar.h
-
 INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
@@ -17,13 +15,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        pushfpopf.stderr.exp pushfpopf.stdout.exp pushfpopf.vgtest \
        pushfw_x86.vgtest pushfw_x86.stdout.exp pushfw_x86.stderr.exp \
        pushpopmem.stderr.exp pushpopmem.stdout.exp pushpopmem.vgtest \
-       scalar.stderr.exp scalar.stderr.exp2 scalar.vgtest \
-       scalar_fork.stderr.exp scalar_fork.vgtest \
-       scalar_exit_group.stderr.exp scalar_exit_group.stderr.exp2 \
-       scalar_exit_group.vgtest \
-       scalar_supp.stderr.exp scalar_supp.stderr.exp2 \
-       scalar_supp.vgtest scalar_supp.supp \
-       scalar_vfork.stderr.exp scalar_vfork.vgtest \
        sse1_memory.stderr.exp sse1_memory.stdout.exp sse1_memory.vgtest \
        sse2_memory.stderr.exp sse2_memory.stdout.exp sse2_memory.vgtest \
        tronical.stderr.exp tronical.vgtest \
@@ -38,10 +29,9 @@ check_PROGRAMS = \
        espindola2 \
        fxsave \
        int3-x86 \
-       scalar_exit_group scalar_fork scalar_supp scalar_vfork \
        fpeflags pushfpopf \
        pushfw_x86 \
-       pushpopmem scalar sse_memory tronical \
+       pushpopmem sse_memory tronical \
        more_x86_fp fprem xor-undef-x86
 
 AM_CPPFLAGS  = -I$(top_srcdir)/include