From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 17 Apr 2009 06:52:10 +0000 (+0000)
Subject: Move with-space to linux/, because it's hard to replicate on Darwin.
X-Git-Tag: svn/VALGRIND_3_5_0~807
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4481c22c52f4d39363538f83c79d764a0fc00edd;p=thirdparty%2Fvalgrind.git

Move with-space to linux/, because it's hard to replicate on Darwin.



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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1d2e9a62ca..2962f8f1ef 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -160,7 +160,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	vcpu_fbench.stdout.exp vcpu_fbench.stderr.exp vcpu_fbench.vgtest \
 	vcpu_fnfns.stdout.exp vcpu_fnfns.stdout.exp-glibc28-amd64 \
 	vcpu_fnfns.stderr.exp vcpu_fnfns.vgtest \
-	with-space.stderr.exp with-space.stdout.exp with-space.vgtest \
 	wrap1.vgtest wrap1.stdout.exp wrap1.stderr.exp \
 	wrap2.vgtest wrap2.stdout.exp wrap2.stderr.exp \
 	wrap3.vgtest wrap3.stdout.exp wrap3.stderr.exp \
diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index 4124c855c8..81a2c9bd49 100644
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -7,7 +7,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	brk.stderr.exp brk.vgtest \
 	capget capget.stderr.exp \
 	stack_switch.stderr.exp stack_switch.vgtest \
-	timerfd-syscall timerfd-syscall.stderr.exp
+	timerfd-syscall timerfd-syscall.stderr.exp \
+	with-space.stderr.exp with-space.stdout.exp with-space.vgtest
 
 check_PROGRAMS = \
 	brk \
diff --git a/memcheck/tests/with-space.stderr.exp b/memcheck/tests/linux/with-space.stderr.exp
similarity index 100%
rename from memcheck/tests/with-space.stderr.exp
rename to memcheck/tests/linux/with-space.stderr.exp
diff --git a/memcheck/tests/with-space.stdout.exp b/memcheck/tests/linux/with-space.stdout.exp
similarity index 100%
rename from memcheck/tests/with-space.stdout.exp
rename to memcheck/tests/linux/with-space.stdout.exp
diff --git a/memcheck/tests/linux/with-space.vgtest b/memcheck/tests/linux/with-space.vgtest
new file mode 100644
index 0000000000..f59ba2f3a5
--- /dev/null
+++ b/memcheck/tests/linux/with-space.vgtest
@@ -0,0 +1,14 @@
+# Use the "prereq" command to copy manuel1 to a filename containing a space.
+# This used to not work properly, because the debug info would not be read
+# correctly for filenames containing spaces (bug #88678).
+#
+# Nb: we only run this test on Linux.  This is because on Darwin you can't
+# easily rename an executable with a .dSYM -- the original executable name
+# gets baked into the .dSYM, so renaming the .dSYM as well isn't enough, you
+# have to modify the contents of the .dSYM.  Another idea would be to avoid
+# the renaming in the first place by just using 'with space' as the
+# filename, but automake doesn't seem to like files containing spaces.
+prereq: cp ../manuel1 'with space'
+prog: 'with space'
+vgopts: -q
+cleanup: rm 'with space'
diff --git a/memcheck/tests/with-space.vgtest b/memcheck/tests/with-space.vgtest
deleted file mode 100644
index b7ffee54c5..0000000000
--- a/memcheck/tests/with-space.vgtest
+++ /dev/null
@@ -1,7 +0,0 @@
-# Use the "prereq" command to copy manuel1 to a filename containing a space.
-# This used to not work properly, because the debug info would not be read
-# correctly for filenames containing spaces (bug #88678).
-prereq: cp manuel1 'with space'
-prog: 'with space'
-vgopts: -q
-cleanup: rm 'with space'