From: Julian Seward Date: Wed, 4 May 2005 13:53:00 +0000 (+0000) Subject: Move all the 'scalar' (syscall-arg) tests into x86/. In fact they are X-Git-Tag: svn/VALGRIND_3_0_0~703 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf6bf8fbbef2d525d175638f45ca95acdca6e96e;p=thirdparty%2Fvalgrind.git Move all the 'scalar' (syscall-arg) tests into x86/. In fact they are really x86-linux specific, but fixing it all properly will have to wait for another day. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3615 --- diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 20947b53d2..a96f3b7f1f 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -4,8 +4,6 @@ DIST_SUBDIRS = ${VG_ARCH_ALL} . noinst_SCRIPTS = filter_allocs filter_leak_check_size \ filter_stderr filter_stderr_backtrace -noinst_HEADERS = scalar.h - EXTRA_DIST = $(noinst_SCRIPTS) \ addressable.stderr.exp addressable.stdout.exp addressable.vgtest \ badaddrvalue.stderr.exp \ @@ -63,11 +61,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ realloc1.stderr.exp realloc1.vgtest \ realloc2.stderr.exp realloc2.vgtest \ realloc3.stderr.exp realloc3.vgtest \ - scalar.stderr.exp scalar.vgtest \ - scalar_fork.stderr.exp scalar_fork.vgtest \ - scalar_exit_group.stderr.exp scalar_exit_group.vgtest \ - scalar_supp.stderr.exp scalar_supp.vgtest scalar_supp.supp \ - scalar_vfork.stderr.exp scalar_vfork.vgtest \ sigaltstack.stderr.exp sigaltstack.vgtest \ signal2.stderr.exp signal2.stdout.exp signal2.vgtest \ sigprocmask.stderr.exp sigprocmask.vgtest \ @@ -101,7 +94,6 @@ check_PROGRAMS = \ pointer-trace \ post-syscall \ realloc1 realloc2 realloc3 \ - scalar scalar_exit_group scalar_fork scalar_supp scalar_vfork \ sigaltstack signal2 sigprocmask \ str_tester supp1 supp2 suppfree \ trivialleak weirdioctl \ @@ -167,11 +159,6 @@ post_syscall_SOURCES = post-syscall.c realloc1_SOURCES = realloc1.c realloc2_SOURCES = realloc2.c realloc3_SOURCES = realloc3.c -scalar_SOURCES = scalar.c -scalar_exit_group_SOURCES = scalar_exit_group.c -scalar_fork_SOURCES = scalar_fork.c -scalar_supp_SOURCES = scalar_supp.c -scalar_vfork_SOURCES = scalar_vfork.c signal2_SOURCES = signal2.c sigprocmask_SOURCES = sigprocmask.c supp1_SOURCES = supp.c diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am index 3a1e688cb1..3524d97966 100644 --- a/memcheck/tests/x86/Makefile.am +++ b/memcheck/tests/x86/Makefile.am @@ -1,12 +1,20 @@ noinst_SCRIPTS = filter_stderr filter_pushfpopf filter_tronical +noinst_HEADERS = scalar.h + EXTRA_DIST = $(noinst_SCRIPTS) \ fpeflags.stderr.exp fpeflags.vgtest \ pushfpopf.stderr.exp pushfpopf.stdout.exp pushfpopf.vgtest \ + scalar.stderr.exp scalar.vgtest \ + scalar_fork.stderr.exp scalar_fork.vgtest \ + scalar_exit_group.stderr.exp scalar_exit_group.vgtest \ + scalar_supp.stderr.exp scalar_supp.vgtest scalar_supp.supp \ + scalar_vfork.stderr.exp scalar_vfork.vgtest \ tronical.stderr.exp tronical.vgtest check_PROGRAMS = \ - fpeflags pushfpopf tronical + scalar_exit_group scalar_fork scalar_supp scalar_vfork \ + fpeflags pushfpopf scalar tronical AM_CPPFLAGS = -I$(top_srcdir)/include AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g @@ -16,4 +24,9 @@ fpeflags_SOURCES = fpeflags.c # must be built with these flags -- bug only occurred with them fpeflags_CFLAGS = $(AM_CFLAGS) -march=i686 pushfpopf_SOURCES = pushfpopf_c.c pushfpopf_s.s +scalar_SOURCES = scalar.c +scalar_exit_group_SOURCES = scalar_exit_group.c +scalar_fork_SOURCES = scalar_fork.c +scalar_supp_SOURCES = scalar_supp.c +scalar_vfork_SOURCES = scalar_vfork.c tronical_SOURCES = tronical.S diff --git a/memcheck/tests/scalar.c b/memcheck/tests/x86/scalar.c similarity index 99% rename from memcheck/tests/scalar.c rename to memcheck/tests/x86/scalar.c index cbd1313148..b5e8e734f7 100644 --- a/memcheck/tests/scalar.c +++ b/memcheck/tests/x86/scalar.c @@ -1,4 +1,4 @@ -#include "../memcheck.h" +#include "../../memcheck.h" #include "scalar.h" // Here we are trying to trigger every syscall error (scalar errors and diff --git a/memcheck/tests/scalar.h b/memcheck/tests/x86/scalar.h similarity index 93% rename from memcheck/tests/scalar.h rename to memcheck/tests/x86/scalar.h index be1246506f..f9e1c99aaa 100644 --- a/memcheck/tests/scalar.h +++ b/memcheck/tests/x86/scalar.h @@ -1,5 +1,4 @@ -// XXX: x86-specific, so these should be in x86/, or something -#include "../../coregrind/x86-linux/vki_unistd.h" +#include "../../../coregrind/x86-linux/vki_unistd.h" #include #include diff --git a/memcheck/tests/scalar.stderr.exp b/memcheck/tests/x86/scalar.stderr.exp similarity index 100% rename from memcheck/tests/scalar.stderr.exp rename to memcheck/tests/x86/scalar.stderr.exp diff --git a/memcheck/tests/scalar.vgtest b/memcheck/tests/x86/scalar.vgtest similarity index 100% rename from memcheck/tests/scalar.vgtest rename to memcheck/tests/x86/scalar.vgtest diff --git a/memcheck/tests/scalar_exit_group.c b/memcheck/tests/x86/scalar_exit_group.c similarity index 100% rename from memcheck/tests/scalar_exit_group.c rename to memcheck/tests/x86/scalar_exit_group.c diff --git a/memcheck/tests/scalar_exit_group.stderr.exp b/memcheck/tests/x86/scalar_exit_group.stderr.exp similarity index 100% rename from memcheck/tests/scalar_exit_group.stderr.exp rename to memcheck/tests/x86/scalar_exit_group.stderr.exp diff --git a/memcheck/tests/scalar_exit_group.vgtest b/memcheck/tests/x86/scalar_exit_group.vgtest similarity index 100% rename from memcheck/tests/scalar_exit_group.vgtest rename to memcheck/tests/x86/scalar_exit_group.vgtest diff --git a/memcheck/tests/scalar_fork.c b/memcheck/tests/x86/scalar_fork.c similarity index 100% rename from memcheck/tests/scalar_fork.c rename to memcheck/tests/x86/scalar_fork.c diff --git a/memcheck/tests/scalar_fork.stderr.exp b/memcheck/tests/x86/scalar_fork.stderr.exp similarity index 100% rename from memcheck/tests/scalar_fork.stderr.exp rename to memcheck/tests/x86/scalar_fork.stderr.exp diff --git a/memcheck/tests/scalar_fork.vgtest b/memcheck/tests/x86/scalar_fork.vgtest similarity index 100% rename from memcheck/tests/scalar_fork.vgtest rename to memcheck/tests/x86/scalar_fork.vgtest diff --git a/memcheck/tests/scalar_supp.c b/memcheck/tests/x86/scalar_supp.c similarity index 100% rename from memcheck/tests/scalar_supp.c rename to memcheck/tests/x86/scalar_supp.c diff --git a/memcheck/tests/scalar_supp.stderr.exp b/memcheck/tests/x86/scalar_supp.stderr.exp similarity index 100% rename from memcheck/tests/scalar_supp.stderr.exp rename to memcheck/tests/x86/scalar_supp.stderr.exp diff --git a/memcheck/tests/scalar_supp.supp b/memcheck/tests/x86/scalar_supp.supp similarity index 100% rename from memcheck/tests/scalar_supp.supp rename to memcheck/tests/x86/scalar_supp.supp diff --git a/memcheck/tests/scalar_supp.vgtest b/memcheck/tests/x86/scalar_supp.vgtest similarity index 100% rename from memcheck/tests/scalar_supp.vgtest rename to memcheck/tests/x86/scalar_supp.vgtest diff --git a/memcheck/tests/scalar_vfork.c b/memcheck/tests/x86/scalar_vfork.c similarity index 100% rename from memcheck/tests/scalar_vfork.c rename to memcheck/tests/x86/scalar_vfork.c diff --git a/memcheck/tests/scalar_vfork.stderr.exp b/memcheck/tests/x86/scalar_vfork.stderr.exp similarity index 100% rename from memcheck/tests/scalar_vfork.stderr.exp rename to memcheck/tests/x86/scalar_vfork.stderr.exp diff --git a/memcheck/tests/scalar_vfork.vgtest b/memcheck/tests/x86/scalar_vfork.vgtest similarity index 100% rename from memcheck/tests/scalar_vfork.vgtest rename to memcheck/tests/x86/scalar_vfork.vgtest