From: Nicholas Nethercote Date: Wed, 20 Oct 2004 11:43:01 +0000 (+0000) Subject: Arch-abstraction: X-Git-Tag: svn/VALGRIND_3_0_0~1478 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41897a01a9dd14512656ef8d4cde9be751242c2b;p=thirdparty%2Fvalgrind.git Arch-abstraction: - move remaining x86-specific Memcheck tests into an x86/ subdir. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2817 --- diff --git a/memcheck/tests/.cvsignore b/memcheck/tests/.cvsignore index 27a7a5b83c..c4e3da2b15 100644 --- a/memcheck/tests/.cvsignore +++ b/memcheck/tests/.cvsignore @@ -18,7 +18,6 @@ execve2 exitprog filter_leak_check_size filter_stderr -fpeflags fprw fwrite hello @@ -40,7 +39,6 @@ nanoleak new_override null_socket overlap -pushfpopf realloc1 realloc2 sigaltstack @@ -49,7 +47,6 @@ supp1 supp2 suppfree trivialleak -tronical vgtest_ume weirdioctl *.stdout.diff diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index eea28453de..a3c8bc026b 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = ${VG_ARCH} . noinst_SCRIPTS = filter_allocs filter_leak_check_size \ - filter_stderr filter_stderr_backtrace filter_pushfpopf \ - filter_tronical + filter_stderr filter_stderr_backtrace EXTRA_DIST = $(noinst_SCRIPTS) \ badaddrvalue.stderr.exp \ @@ -25,7 +24,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ exitprog.stderr.exp exitprog.vgtest \ execve.stderr.exp execve.vgtest \ execve2.stderr.exp execve2.vgtest \ - fpeflags.stderr.exp fpeflags.vgtest \ fprw.stderr.exp fprw.vgtest \ fwrite.stderr.exp fwrite.stdout.exp fwrite.vgtest \ inits.stderr.exp inits.vgtest \ @@ -49,7 +47,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ null_socket.stderr.exp null_socket.vgtest \ overlap.stderr.exp overlap.stdout.exp overlap.vgtest \ pth_once.stderr.exp pth_once.stdout.exp pth_once.vgtest \ - pushfpopf.stderr.exp pushfpopf.stdout.exp pushfpopf.vgtest \ realloc1.stderr.exp realloc1.vgtest \ realloc2.stderr.exp realloc2.vgtest \ realloc3.stderr.exp realloc3.vgtest \ @@ -62,7 +59,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ suppfree.stderr.exp suppfree.vgtest \ toobig-allocs.stderr.exp toobig-allocs.vgtest \ trivialleak.stderr.exp trivialleak.vgtest \ - tronical.stderr.exp tronical.vgtest \ weirdioctl.stderr.exp weirdioctl.stdout.exp weirdioctl.vgtest \ metadata.stderr.exp metadata.stdout.exp metadata.vgtest \ threadederrno.stderr.exp threadederrno.stdout.exp \ @@ -76,13 +72,13 @@ check_PROGRAMS = \ badloop badrw brk brk2 buflen_check \ clientperm custom_alloc \ doublefree error_counts errs1 exitprog execve execve2 \ - fpeflags fprw fwrite hello inits inline \ + fprw fwrite hello inits inline \ malloc1 malloc2 malloc3 manuel1 manuel2 manuel3 \ memalign_test memalign2 memcmptest mempool mmaptest \ nanoleak new_nothrow \ - null_socket overlap pushfpopf \ + null_socket overlap \ realloc1 realloc2 realloc3 sigaltstack signal2 supp1 supp2 suppfree \ - trivialleak tronical weirdioctl \ + trivialleak weirdioctl \ mismatches new_override metadata threadederrno \ vgtest_ume \ writev zeropage @@ -110,7 +106,6 @@ errs1_SOURCES = errs1.c execve_SOURCES = execve.c execve2_SOURCES = execve2.c exitprog_SOURCES = exitprog.c -fpeflags_SOURCES = fpeflags.c fprw_SOURCES = fprw.c fwrite_SOURCES = fwrite.c inits_SOURCES = inits.c @@ -129,7 +124,6 @@ mempool_SOURCES = mempool.c nanoleak_SOURCES = nanoleak.c null_socket_SOURCES = null_socket.c overlap_SOURCES = overlap.c -pushfpopf_SOURCES = pushfpopf_c.c pushfpopf_s.s realloc1_SOURCES = realloc1.c realloc2_SOURCES = realloc2.c realloc3_SOURCES = realloc3.c @@ -139,7 +133,6 @@ supp2_SOURCES = supp.c suppfree_SOURCES = suppfree.c sigaltstack_SOURCES = sigaltstack.c trivialleak_SOURCES = trivialleak.c -tronical_SOURCES = tronical.S weirdioctl_SOURCES = weirdioctl.c metadata_SOURCES = metadata.c threadederrno_SOURCES = threadederrno.c @@ -160,5 +153,3 @@ vgtest_ume_SOURCES = vgtest_ume.c vgtest_ume_LDADD = ../../coregrind/ume.o \ ../../coregrind/jmp_with_stack.o -# must be built with these flags -- bug only occurred with them -fpeflags.o: CFLAGS += -march=i686 diff --git a/memcheck/tests/x86/.cvsignore b/memcheck/tests/x86/.cvsignore index e963d04157..188b94b0eb 100644 --- a/memcheck/tests/x86/.cvsignore +++ b/memcheck/tests/x86/.cvsignore @@ -1,5 +1,8 @@ Makefile.in Makefile +fpeflags +pushfpopf +tronical *.stdout.diff *.stderr.diff* *.stdout.out diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am index 7bd6d4cc6c..21920854bd 100644 --- a/memcheck/tests/x86/Makefile.am +++ b/memcheck/tests/x86/Makefile.am @@ -1,8 +1,24 @@ -noinst_SCRIPTS = filter_stderr +noinst_SCRIPTS = filter_stderr filter_pushfpopf filter_tronical INSN_TESTS=insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2 EXTRA_DIST = $(noinst_SCRIPTS) \ + fpeflags.stderr.exp fpeflags.vgtest \ $(addsuffix .stderr.exp,$(INSN_TESTS)) \ $(addsuffix .stdout.exp,$(INSN_TESTS)) \ - $(addsuffix .vgtest,$(INSN_TESTS)) + $(addsuffix .vgtest,$(INSN_TESTS)) \ + pushfpopf.stderr.exp pushfpopf.stdout.exp pushfpopf.vgtest \ + tronical.stderr.exp tronical.vgtest + +check_PROGRAMS = \ + fpeflags pushfpopf tronical + +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g +AM_CXXFLAGS = $(AM_CFLAGS) + +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 +tronical_SOURCES = tronical.S diff --git a/memcheck/tests/filter_pushfpopf b/memcheck/tests/x86/filter_pushfpopf similarity index 100% rename from memcheck/tests/filter_pushfpopf rename to memcheck/tests/x86/filter_pushfpopf diff --git a/memcheck/tests/filter_tronical b/memcheck/tests/x86/filter_tronical similarity index 100% rename from memcheck/tests/filter_tronical rename to memcheck/tests/x86/filter_tronical diff --git a/memcheck/tests/fpeflags.c b/memcheck/tests/x86/fpeflags.c similarity index 100% rename from memcheck/tests/fpeflags.c rename to memcheck/tests/x86/fpeflags.c diff --git a/memcheck/tests/fpeflags.stderr.exp b/memcheck/tests/x86/fpeflags.stderr.exp similarity index 100% rename from memcheck/tests/fpeflags.stderr.exp rename to memcheck/tests/x86/fpeflags.stderr.exp diff --git a/memcheck/tests/fpeflags.vgtest b/memcheck/tests/x86/fpeflags.vgtest similarity index 100% rename from memcheck/tests/fpeflags.vgtest rename to memcheck/tests/x86/fpeflags.vgtest diff --git a/memcheck/tests/pushfpopf.stderr.exp b/memcheck/tests/x86/pushfpopf.stderr.exp similarity index 100% rename from memcheck/tests/pushfpopf.stderr.exp rename to memcheck/tests/x86/pushfpopf.stderr.exp diff --git a/memcheck/tests/pushfpopf.stdout.exp b/memcheck/tests/x86/pushfpopf.stdout.exp similarity index 100% rename from memcheck/tests/pushfpopf.stdout.exp rename to memcheck/tests/x86/pushfpopf.stdout.exp diff --git a/memcheck/tests/pushfpopf.vgtest b/memcheck/tests/x86/pushfpopf.vgtest similarity index 100% rename from memcheck/tests/pushfpopf.vgtest rename to memcheck/tests/x86/pushfpopf.vgtest diff --git a/memcheck/tests/pushfpopf_c.c b/memcheck/tests/x86/pushfpopf_c.c similarity index 100% rename from memcheck/tests/pushfpopf_c.c rename to memcheck/tests/x86/pushfpopf_c.c diff --git a/memcheck/tests/pushfpopf_s.s b/memcheck/tests/x86/pushfpopf_s.s similarity index 100% rename from memcheck/tests/pushfpopf_s.s rename to memcheck/tests/x86/pushfpopf_s.s diff --git a/memcheck/tests/tronical.S b/memcheck/tests/x86/tronical.S similarity index 100% rename from memcheck/tests/tronical.S rename to memcheck/tests/x86/tronical.S diff --git a/memcheck/tests/tronical.stderr.exp b/memcheck/tests/x86/tronical.stderr.exp similarity index 100% rename from memcheck/tests/tronical.stderr.exp rename to memcheck/tests/x86/tronical.stderr.exp diff --git a/memcheck/tests/tronical.vgtest b/memcheck/tests/x86/tronical.vgtest similarity index 100% rename from memcheck/tests/tronical.vgtest rename to memcheck/tests/x86/tronical.vgtest