|
From: <sv...@va...> - 2010-07-01 01:09:50
|
Author: njn Date: 2010-07-01 02:09:42 +0100 (Thu, 01 Jul 2010) New Revision: 11199 Log: Fix various bits of regtest breakage on amd64-linux caused by the MACOSX106 merge. Added: trunk/memcheck/tests/amd64-linux/filter_defcfaexpr Removed: trunk/memcheck/tests/amd64/filter_defcfaexpr Modified: trunk/memcheck/tests/amd64-linux/Makefile.am trunk/memcheck/tests/amd64/Makefile.am Modified: trunk/memcheck/tests/amd64/Makefile.am =================================================================== --- trunk/memcheck/tests/amd64/Makefile.am 2010-07-01 00:48:38 UTC (rev 11198) +++ trunk/memcheck/tests/amd64/Makefile.am 2010-07-01 01:09:42 UTC (rev 11199) @@ -12,7 +12,6 @@ bt_everything.stderr.exp bt_everything.stdout.exp \ bt_everything.vgtest \ bug132146.vgtest bug132146.stderr.exp bug132146.stdout.exp \ - defcfaexpr.vgtest defcfaexpr.stderr.exp filter_defcfaexpr \ fxsave-amd64.vgtest fxsave-amd64.stdout.exp fxsave-amd64.stderr.exp \ int3-amd64.vgtest int3-amd64.stdout.exp int3-amd64.stderr.exp \ more_x87_fp.stderr.exp more_x87_fp.stdout.exp more_x87_fp.vgtest \ @@ -28,13 +27,6 @@ sse_memory \ xor-undef-amd64 -# DDD: these should be moved into amd64-linux/. -if ! VGCONF_OS_IS_DARWIN - check_PROGRAMS += \ - defcfaexpr \ - int3-amd64 -endif - AM_CFLAGS += @FLAG_M64@ AM_CXXFLAGS += @FLAG_M64@ AM_CCASFLAGS += @FLAG_M64@ @@ -43,4 +35,3 @@ -mfancy-math-387 more_x87_fp_LDADD = -lm -defcfaexpr_SOURCES = defcfaexpr.S Deleted: trunk/memcheck/tests/amd64/filter_defcfaexpr =================================================================== --- trunk/memcheck/tests/amd64/filter_defcfaexpr 2010-07-01 00:48:38 UTC (rev 11198) +++ trunk/memcheck/tests/amd64/filter_defcfaexpr 2010-07-01 01:09:42 UTC (rev 11199) @@ -1,28 +0,0 @@ -#! /bin/sh - -# change -# -# ==6019== at 0x400512: bbb (in -# /home/sewardj/VgTRUNK/trunk/memcheck/tests/amd64/defcfaexpr) -# -# to -# -# ==6019== at 0x400512: bbb (in bogus.S:0) -# -# and then to -# -# ==6019== at 0x400512: bbb (bogus.S:0) -# -# Then the standard ./filter_stderr won't screw it up any more, -# instead producing what we want, which is -# -# at 0x........: bbb (bogus.S:0) -# -# where the important point is that the function name is intact. -# since the point of this test is to check that V can unwind the -# stack given the unusual CFAs describing it. - - -sed "s/\/.*\/tests\/amd64\/defcfaexpr/bogus.S:0/" | \ - sed "s/(in /(/" | \ - ./filter_stderr Modified: trunk/memcheck/tests/amd64-linux/Makefile.am =================================================================== --- trunk/memcheck/tests/amd64-linux/Makefile.am 2010-07-01 00:48:38 UTC (rev 11198) +++ trunk/memcheck/tests/amd64-linux/Makefile.am 2010-07-01 01:09:42 UTC (rev 11199) @@ -2,18 +2,20 @@ include $(top_srcdir)/Makefile.tool-tests.am dist_noinst_SCRIPTS = \ - filter_stderr + filter_stderr filter_defcfaexpr EXTRA_DIST = \ - defcaexpr.vgtest defcaexpr.stderr.exp \ + defcfaexpr.vgtest defcfaexpr.stderr.exp \ int3-x86.vgtest int3-x86.stderr.exp int3-x86.stdout.exp check_PROGRAMS = \ - defcaexpr \ + defcfaexpr \ int3-amd64 -AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS += @FLAG_M32@ +AM_CFLAGS += @FLAG_M64@ +AM_CXXFLAGS += @FLAG_M64@ +AM_CCASFLAGS += @FLAG_M64@ +defcfaexpr_SOURCES = defcfaexpr.S + Copied: trunk/memcheck/tests/amd64-linux/filter_defcfaexpr (from rev 11195, trunk/memcheck/tests/amd64/filter_defcfaexpr) =================================================================== --- trunk/memcheck/tests/amd64-linux/filter_defcfaexpr (rev 0) +++ trunk/memcheck/tests/amd64-linux/filter_defcfaexpr 2010-07-01 01:09:42 UTC (rev 11199) @@ -0,0 +1,28 @@ +#! /bin/sh + +# change +# +# ==6019== at 0x400512: bbb (in +# /home/sewardj/VgTRUNK/trunk/memcheck/tests/amd64/defcfaexpr) +# +# to +# +# ==6019== at 0x400512: bbb (in bogus.S:0) +# +# and then to +# +# ==6019== at 0x400512: bbb (bogus.S:0) +# +# Then the standard ./filter_stderr won't screw it up any more, +# instead producing what we want, which is +# +# at 0x........: bbb (bogus.S:0) +# +# where the important point is that the function name is intact. +# since the point of this test is to check that V can unwind the +# stack given the unusual CFAs describing it. + + +sed "s/\/.*\/tests\/amd64-linux\/defcfaexpr/bogus.S:0/" | \ + sed "s/(in /(/" | \ + ./filter_stderr |