From 1165808df3e0717f82d03b82bddc742c1250b25c Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Tue, 28 Jul 2009 05:10:33 +0000 Subject: [PATCH] Make lsframe1, lsframe2 and stack_changes Linux-only since they all fault natively on Mac. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10645 --- memcheck/tests/Makefile.am | 9 ++------- memcheck/tests/linux/Makefile.am | 7 +++++++ memcheck/tests/{ => linux}/lsframe1.c | 0 memcheck/tests/{ => linux}/lsframe1.stderr.exp | 0 memcheck/tests/{ => linux}/lsframe1.stdout.exp | 0 memcheck/tests/{ => linux}/lsframe1.vgtest | 0 memcheck/tests/{ => linux}/lsframe2.c | 0 memcheck/tests/{ => linux}/lsframe2.stderr.exp | 0 memcheck/tests/{ => linux}/lsframe2.stdout.exp | 0 memcheck/tests/{ => linux}/lsframe2.vgtest | 0 memcheck/tests/{ => linux}/stack_changes.c | 0 memcheck/tests/{ => linux}/stack_changes.stderr.exp | 0 memcheck/tests/{ => linux}/stack_changes.stdout.exp | 0 memcheck/tests/{ => linux}/stack_changes.stdout.exp2 | 0 memcheck/tests/{ => linux}/stack_changes.vgtest | 0 15 files changed, 9 insertions(+), 7 deletions(-) rename memcheck/tests/{ => linux}/lsframe1.c (100%) rename memcheck/tests/{ => linux}/lsframe1.stderr.exp (100%) rename memcheck/tests/{ => linux}/lsframe1.stdout.exp (100%) rename memcheck/tests/{ => linux}/lsframe1.vgtest (100%) rename memcheck/tests/{ => linux}/lsframe2.c (100%) rename memcheck/tests/{ => linux}/lsframe2.stderr.exp (100%) rename memcheck/tests/{ => linux}/lsframe2.stdout.exp (100%) rename memcheck/tests/{ => linux}/lsframe2.vgtest (100%) rename memcheck/tests/{ => linux}/stack_changes.c (100%) rename memcheck/tests/{ => linux}/stack_changes.stderr.exp (100%) rename memcheck/tests/{ => linux}/stack_changes.stdout.exp (100%) rename memcheck/tests/{ => linux}/stack_changes.stdout.exp2 (100%) rename memcheck/tests/{ => linux}/stack_changes.vgtest (100%) diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index d12e483303..fa42bb84fd 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -84,8 +84,6 @@ EXTRA_DIST = \ long_namespace_xml.vgtest long_namespace_xml.stdout.exp \ long_namespace_xml.stderr.exp \ long-supps.vgtest long-supps.stderr.exp long-supps.supp \ - lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \ - lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \ mallinfo.stderr.exp mallinfo.vgtest \ malloc_free_fill.vgtest \ malloc_free_fill.stderr.exp \ @@ -147,8 +145,6 @@ EXTRA_DIST = \ sigkill.stderr.exp sigkill.stderr.exp-darwin sigkill.vgtest \ signal2.stderr.exp signal2.stdout.exp signal2.vgtest \ sigprocmask.stderr.exp sigprocmask.stderr.exp2 sigprocmask.vgtest \ - stack_changes.stderr.exp stack_changes.stdout.exp \ - stack_changes.stdout.exp2 stack_changes.vgtest \ strchr.stderr.exp strchr.stderr.exp2 strchr.stderr.exp-darwin \ strchr.vgtest \ str_tester.stderr.exp str_tester.vgtest \ @@ -209,8 +205,6 @@ check_PROGRAMS = \ linux-syscalls-2007 \ long_namespace_xml \ long-supps \ - lsframe1 \ - lsframe2 \ mallinfo \ malloc_free_fill \ malloc_usable malloc1 malloc2 malloc3 manuel1 manuel2 manuel3 \ @@ -230,7 +224,8 @@ check_PROGRAMS = \ realloc1 realloc2 realloc3 \ sh-mem sh-mem-random \ sigaltstack signal2 sigprocmask sigkill \ - stack_changes strchr str_tester \ + strchr \ + str_tester \ supp_unknown supp1 supp2 suppfree \ trivialleak \ unit_libcbase unit_oset \ diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am index d5f808879b..a7a2d0201d 100644 --- a/memcheck/tests/linux/Makefile.am +++ b/memcheck/tests/linux/Makefile.am @@ -6,6 +6,10 @@ dist_noinst_SCRIPTS = filter_stderr EXTRA_DIST = \ brk.stderr.exp brk.vgtest \ capget capget.stderr.exp \ + lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \ + lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \ + stack_changes.stderr.exp stack_changes.stdout.exp \ + stack_changes.stdout.exp2 stack_changes.vgtest \ stack_switch.stderr.exp stack_switch.vgtest \ timerfd-syscall timerfd-syscall.stderr.exp \ with-space.stderr.exp with-space.stdout.exp with-space.vgtest @@ -13,6 +17,9 @@ EXTRA_DIST = \ check_PROGRAMS = \ brk \ capget \ + lsframe1 \ + lsframe2 \ + stack_changes \ stack_switch \ timerfd-syscall diff --git a/memcheck/tests/lsframe1.c b/memcheck/tests/linux/lsframe1.c similarity index 100% rename from memcheck/tests/lsframe1.c rename to memcheck/tests/linux/lsframe1.c diff --git a/memcheck/tests/lsframe1.stderr.exp b/memcheck/tests/linux/lsframe1.stderr.exp similarity index 100% rename from memcheck/tests/lsframe1.stderr.exp rename to memcheck/tests/linux/lsframe1.stderr.exp diff --git a/memcheck/tests/lsframe1.stdout.exp b/memcheck/tests/linux/lsframe1.stdout.exp similarity index 100% rename from memcheck/tests/lsframe1.stdout.exp rename to memcheck/tests/linux/lsframe1.stdout.exp diff --git a/memcheck/tests/lsframe1.vgtest b/memcheck/tests/linux/lsframe1.vgtest similarity index 100% rename from memcheck/tests/lsframe1.vgtest rename to memcheck/tests/linux/lsframe1.vgtest diff --git a/memcheck/tests/lsframe2.c b/memcheck/tests/linux/lsframe2.c similarity index 100% rename from memcheck/tests/lsframe2.c rename to memcheck/tests/linux/lsframe2.c diff --git a/memcheck/tests/lsframe2.stderr.exp b/memcheck/tests/linux/lsframe2.stderr.exp similarity index 100% rename from memcheck/tests/lsframe2.stderr.exp rename to memcheck/tests/linux/lsframe2.stderr.exp diff --git a/memcheck/tests/lsframe2.stdout.exp b/memcheck/tests/linux/lsframe2.stdout.exp similarity index 100% rename from memcheck/tests/lsframe2.stdout.exp rename to memcheck/tests/linux/lsframe2.stdout.exp diff --git a/memcheck/tests/lsframe2.vgtest b/memcheck/tests/linux/lsframe2.vgtest similarity index 100% rename from memcheck/tests/lsframe2.vgtest rename to memcheck/tests/linux/lsframe2.vgtest diff --git a/memcheck/tests/stack_changes.c b/memcheck/tests/linux/stack_changes.c similarity index 100% rename from memcheck/tests/stack_changes.c rename to memcheck/tests/linux/stack_changes.c diff --git a/memcheck/tests/stack_changes.stderr.exp b/memcheck/tests/linux/stack_changes.stderr.exp similarity index 100% rename from memcheck/tests/stack_changes.stderr.exp rename to memcheck/tests/linux/stack_changes.stderr.exp diff --git a/memcheck/tests/stack_changes.stdout.exp b/memcheck/tests/linux/stack_changes.stdout.exp similarity index 100% rename from memcheck/tests/stack_changes.stdout.exp rename to memcheck/tests/linux/stack_changes.stdout.exp diff --git a/memcheck/tests/stack_changes.stdout.exp2 b/memcheck/tests/linux/stack_changes.stdout.exp2 similarity index 100% rename from memcheck/tests/stack_changes.stdout.exp2 rename to memcheck/tests/linux/stack_changes.stdout.exp2 diff --git a/memcheck/tests/stack_changes.vgtest b/memcheck/tests/linux/stack_changes.vgtest similarity index 100% rename from memcheck/tests/stack_changes.vgtest rename to memcheck/tests/linux/stack_changes.vgtest -- 2.47.3