|
From: <sv...@va...> - 2009-04-17 07:01:28
|
Author: njn Date: 2009-04-17 08:01:24 +0100 (Fri, 17 Apr 2009) New Revision: 9570 Log: Merge r9569 (move with-space to linux/) from the trunk. Added: branches/DARWIN/memcheck/tests/linux/with-space.stderr.exp branches/DARWIN/memcheck/tests/linux/with-space.stdout.exp branches/DARWIN/memcheck/tests/linux/with-space.vgtest Removed: branches/DARWIN/memcheck/tests/with-space.stderr.exp branches/DARWIN/memcheck/tests/with-space.stdout.exp branches/DARWIN/memcheck/tests/with-space.vgtest Modified: branches/DARWIN/memcheck/tests/Makefile.am branches/DARWIN/memcheck/tests/linux/Makefile.am Modified: branches/DARWIN/memcheck/tests/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/Makefile.am 2009-04-17 06:52:10 UTC (rev 9569) +++ branches/DARWIN/memcheck/tests/Makefile.am 2009-04-17 07:01:24 UTC (rev 9570) @@ -163,7 +163,6 @@ 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 \ Modified: branches/DARWIN/memcheck/tests/linux/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/linux/Makefile.am 2009-04-17 06:52:10 UTC (rev 9569) +++ branches/DARWIN/memcheck/tests/linux/Makefile.am 2009-04-17 07:01:24 UTC (rev 9570) @@ -7,7 +7,8 @@ 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 \ Copied: branches/DARWIN/memcheck/tests/linux/with-space.stderr.exp (from rev 9569, trunk/memcheck/tests/linux/with-space.stderr.exp) =================================================================== --- branches/DARWIN/memcheck/tests/linux/with-space.stderr.exp (rev 0) +++ branches/DARWIN/memcheck/tests/linux/with-space.stderr.exp 2009-04-17 07:01:24 UTC (rev 9570) @@ -0,0 +1,2 @@ +Conditional jump or move depends on uninitialised value(s) + at 0x........: main (manuel1.c:7) Copied: branches/DARWIN/memcheck/tests/linux/with-space.stdout.exp (from rev 9569, trunk/memcheck/tests/linux/with-space.stdout.exp) =================================================================== --- branches/DARWIN/memcheck/tests/linux/with-space.stdout.exp (rev 0) +++ branches/DARWIN/memcheck/tests/linux/with-space.stdout.exp 2009-04-17 07:01:24 UTC (rev 9570) @@ -0,0 +1 @@ +x = 88 Copied: branches/DARWIN/memcheck/tests/linux/with-space.vgtest (from rev 9569, trunk/memcheck/tests/linux/with-space.vgtest) =================================================================== --- branches/DARWIN/memcheck/tests/linux/with-space.vgtest (rev 0) +++ branches/DARWIN/memcheck/tests/linux/with-space.vgtest 2009-04-17 07:01:24 UTC (rev 9570) @@ -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' Deleted: branches/DARWIN/memcheck/tests/with-space.stderr.exp =================================================================== --- branches/DARWIN/memcheck/tests/with-space.stderr.exp 2009-04-17 06:52:10 UTC (rev 9569) +++ branches/DARWIN/memcheck/tests/with-space.stderr.exp 2009-04-17 07:01:24 UTC (rev 9570) @@ -1,2 +0,0 @@ -Conditional jump or move depends on uninitialised value(s) - at 0x........: main (manuel1.c:7) Deleted: branches/DARWIN/memcheck/tests/with-space.stdout.exp =================================================================== --- branches/DARWIN/memcheck/tests/with-space.stdout.exp 2009-04-17 06:52:10 UTC (rev 9569) +++ branches/DARWIN/memcheck/tests/with-space.stdout.exp 2009-04-17 07:01:24 UTC (rev 9570) @@ -1 +0,0 @@ -x = 88 Deleted: branches/DARWIN/memcheck/tests/with-space.vgtest =================================================================== --- branches/DARWIN/memcheck/tests/with-space.vgtest 2009-04-17 06:52:10 UTC (rev 9569) +++ branches/DARWIN/memcheck/tests/with-space.vgtest 2009-04-17 07:01:24 UTC (rev 9570) @@ -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' |