From: Nicholas Nethercote Date: Sat, 25 Apr 2009 03:17:22 +0000 (+0000) Subject: Merge r9621 (move int3-x86 into x86-linux/) from the DARWIN branch. X-Git-Tag: svn/VALGRIND_3_5_0~782 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78a2b63b4ce81e22d204114d0a0adf40c850c6c1;p=thirdparty%2Fvalgrind.git Merge r9621 (move int3-x86 into x86-linux/) from the DARWIN branch. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9623 --- diff --git a/memcheck/tests/x86-linux/Makefile.am b/memcheck/tests/x86-linux/Makefile.am index 3f18f1417c..f8944dfcc4 100644 --- a/memcheck/tests/x86-linux/Makefile.am +++ b/memcheck/tests/x86-linux/Makefile.am @@ -9,6 +9,7 @@ noinst_HEADERS = scalar.h EXTRA_DIST = $(noinst_SCRIPTS) \ bug133694.vgtest bug133694.stderr.exp bug133694.stdout.exp \ + int3-x86.vgtest int3-x86.stderr.exp int3-x86.stdout.exp \ scalar.stderr.exp scalar.vgtest \ scalar_fork.stderr.exp scalar_fork.vgtest \ scalar_exit_group.stderr.exp \ @@ -19,6 +20,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ check_PROGRAMS = \ bug133694 \ + int3-x86 \ scalar scalar_exit_group scalar_fork scalar_supp scalar_vfork diff --git a/memcheck/tests/x86/int3-x86.c b/memcheck/tests/x86-linux/int3-x86.c similarity index 100% rename from memcheck/tests/x86/int3-x86.c rename to memcheck/tests/x86-linux/int3-x86.c diff --git a/memcheck/tests/x86/int3-x86.stderr.exp b/memcheck/tests/x86-linux/int3-x86.stderr.exp similarity index 100% rename from memcheck/tests/x86/int3-x86.stderr.exp rename to memcheck/tests/x86-linux/int3-x86.stderr.exp diff --git a/memcheck/tests/x86/int3-x86.stdout.exp b/memcheck/tests/x86-linux/int3-x86.stdout.exp similarity index 100% rename from memcheck/tests/x86/int3-x86.stdout.exp rename to memcheck/tests/x86-linux/int3-x86.stdout.exp diff --git a/memcheck/tests/x86/int3-x86.vgtest b/memcheck/tests/x86-linux/int3-x86.vgtest similarity index 100% rename from memcheck/tests/x86/int3-x86.vgtest rename to memcheck/tests/x86-linux/int3-x86.vgtest diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am index 4bbb831c76..28dd116fbd 100644 --- a/memcheck/tests/x86/Makefile.am +++ b/memcheck/tests/x86/Makefile.am @@ -13,7 +13,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ $(addsuffix .stderr.exp,$(INSN_TESTS)) \ $(addsuffix .stdout.exp,$(INSN_TESTS)) \ $(addsuffix .vgtest,$(INSN_TESTS)) \ - int3-x86.vgtest int3-x86.stderr.exp int3-x86.stdout.exp \ 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 \ @@ -28,7 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ check_PROGRAMS = \ bug152022 \ espindola2 \ - int3-x86 \ fpeflags \ fprem \ fxsave \