From: Philippe Waroquiers Date: Fri, 22 Jan 2016 22:06:02 +0000 (+0000) Subject: Change tests using --fullpath-after so as to work with ccache caching compiler X-Git-Tag: svn/VALGRIND_3_12_0~252 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80f32e662dfa2a4f046960a25d5b8b7a8821bea;p=thirdparty%2Fvalgrind.git Change tests using --fullpath-after so as to work with ccache caching compiler ccache sometimes causes the source file absolute name to be another full path (not $PWD). This means that the badfree3 and varinfo5 tests can fail due to the full path after not being match on $PWD. So, rather ask full path after a part of the path that is stable even when ccache decides to reuse a already compiled object from another directory. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15771 --- diff --git a/memcheck/tests/badfree3.stderr.exp b/memcheck/tests/badfree3.stderr.exp index 2e1a4bfdef..20e48a6699 100644 --- a/memcheck/tests/badfree3.stderr.exp +++ b/memcheck/tests/badfree3.stderr.exp @@ -1,11 +1,11 @@ Invalid free() / delete / delete[] / realloc() - at 0x........: free (coregrind/vg_replace_malloc.c:...) - by 0x........: main (memcheck/tests/badfree.c:12) + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: main (tests/badfree.c:12) Address 0x........ is not stack'd, malloc'd or (recently) free'd Invalid free() / delete / delete[] / realloc() - at 0x........: free (coregrind/vg_replace_malloc.c:...) - by 0x........: main (memcheck/tests/badfree.c:15) + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: main (tests/badfree.c:15) Address 0x........ is on thread 1's stack in frame #1, created by main (badfree.c:7) diff --git a/memcheck/tests/badfree3.vgtest b/memcheck/tests/badfree3.vgtest index f51a291f9d..3dfc5fd8aa 100644 --- a/memcheck/tests/badfree3.vgtest +++ b/memcheck/tests/badfree3.vgtest @@ -1,3 +1,3 @@ prog: badfree -vgopts: -q --fullpath-after=${PWD}/ +vgopts: -q --fullpath-after=memcheck/ --fullpath-after=coregrind/ stderr_filter_args: badfree.c diff --git a/memcheck/tests/varinfo5.stderr.exp b/memcheck/tests/varinfo5.stderr.exp index 4d29266b7a..239a20c1f0 100644 --- a/memcheck/tests/varinfo5.stderr.exp +++ b/memcheck/tests/varinfo5.stderr.exp @@ -1,191 +1,191 @@ Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:52) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: varinfo1_main (tests/varinfo5so.c:52) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Address 0x........ is 1 bytes inside a block of size 3 alloc'd - at 0x........: malloc (coregrind/vg_replace_malloc.c:...) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:50) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: malloc (vg_replace_malloc.c:...) + by 0x........: varinfo1_main (tests/varinfo5so.c:50) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:55) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: varinfo1_main (tests/varinfo5so.c:55) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside global var "global_u1" declared at varinfo5so.c:38 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:56) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: varinfo1_main (tests/varinfo5so.c:56) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside global var "global_i1" declared at varinfo5so.c:40 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:57) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: varinfo1_main (tests/varinfo5so.c:57) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside global_u2[3], a global variable declared at varinfo5so.c:42 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:58) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: varinfo1_main (tests/varinfo5so.c:58) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside global_i2[7], a global variable declared at varinfo5so.c:44 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: varinfo1_main (memcheck/tests/varinfo5so.c:59) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:154) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: varinfo1_main (tests/varinfo5so.c:59) + by 0x........: varinfo5_main (tests/varinfo5so.c:154) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside local var "local" declared at varinfo5so.c:49, in frame #1 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo2 (memcheck/tests/varinfo5so.c:71) - by 0x........: varinfo2_main (memcheck/tests/varinfo5so.c:81) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:155) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo2 (tests/varinfo5so.c:71) + by 0x........: varinfo2_main (tests/varinfo5so.c:81) + by 0x........: varinfo5_main (tests/varinfo5so.c:155) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside var[7], declared at varinfo5so.c:69, in frame #1 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo2 (memcheck/tests/varinfo5so.c:73) - by 0x........: varinfo2_main (memcheck/tests/varinfo5so.c:81) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:155) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo2 (tests/varinfo5so.c:73) + by 0x........: varinfo2_main (tests/varinfo5so.c:81) + by 0x........: varinfo5_main (tests/varinfo5so.c:155) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 2 bytes inside var.bar, declared at varinfo5so.c:72, in frame #1 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo2 (memcheck/tests/varinfo5so.c:76) - by 0x........: varinfo2_main (memcheck/tests/varinfo5so.c:81) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:155) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo2 (tests/varinfo5so.c:76) + by 0x........: varinfo2_main (tests/varinfo5so.c:81) + by 0x........: varinfo5_main (tests/varinfo5so.c:155) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 1 byte inside local var "var" declared at varinfo5so.c:67, in frame #1 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:106) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo3 (tests/varinfo5so.c:106) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside static_global_def[1], a global variable declared at varinfo5so.c:87 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:107) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo3 (tests/varinfo5so.c:107) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside nonstatic_global_def[2], a global variable declared at varinfo5so.c:88 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:108) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo3 (tests/varinfo5so.c:108) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside static_global_undef[3], a global variable declared at varinfo5so.c:89 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:109) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: foo3 (tests/varinfo5so.c:109) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside nonstatic_global_undef[4], a global variable declared at varinfo5so.c:90 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: bar3 (memcheck/tests/varinfo5so.c:94) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:110) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: bar3 (tests/varinfo5so.c:94) + by 0x........: foo3 (tests/varinfo5so.c:110) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Address 0x........ is 5 bytes inside data symbol "static_local_def.XXXX" Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: bar3 (memcheck/tests/varinfo5so.c:95) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:110) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: bar3 (tests/varinfo5so.c:95) + by 0x........: foo3 (tests/varinfo5so.c:110) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside nonstatic_local_def[6], declared at varinfo5so.c:103, in frame #2 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: bar3 (memcheck/tests/varinfo5so.c:96) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:110) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: bar3 (tests/varinfo5so.c:96) + by 0x........: foo3 (tests/varinfo5so.c:110) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Address 0x........ is 7 bytes inside data symbol "static_local_undef.XXXX" Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: bar3 (memcheck/tests/varinfo5so.c:97) - by 0x........: foo3 (memcheck/tests/varinfo5so.c:110) - by 0x........: varinfo3_main (memcheck/tests/varinfo5so.c:118) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:156) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: bar3 (tests/varinfo5so.c:97) + by 0x........: foo3 (tests/varinfo5so.c:110) + by 0x........: varinfo3_main (tests/varinfo5so.c:118) + by 0x........: varinfo5_main (tests/varinfo5so.c:156) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside nonstatic_local_undef[8], declared at varinfo5so.c:105, in frame #2 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: blah4 (memcheck/tests/varinfo5so.c:137) - by 0x........: varinfo4_main (memcheck/tests/varinfo5so.c:146) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:157) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: blah4 (tests/varinfo5so.c:137) + by 0x........: varinfo4_main (tests/varinfo5so.c:146) + by 0x........: varinfo5_main (tests/varinfo5so.c:157) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 1 byte inside a[3].xyzzy[21].c1, declared at varinfo5so.c:135, in frame #1 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: blah4 (memcheck/tests/varinfo5so.c:138) - by 0x........: varinfo4_main (memcheck/tests/varinfo5so.c:146) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:157) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: blah4 (tests/varinfo5so.c:138) + by 0x........: varinfo4_main (tests/varinfo5so.c:146) + by 0x........: varinfo5_main (tests/varinfo5so.c:157) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 0 bytes inside a[5].bong, declared at varinfo5so.c:135, in frame #1 of thread 1 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: blah4 (memcheck/tests/varinfo5so.c:139) - by 0x........: varinfo4_main (memcheck/tests/varinfo5so.c:146) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:157) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: blah4 (tests/varinfo5so.c:139) + by 0x........: varinfo4_main (tests/varinfo5so.c:146) + by 0x........: varinfo5_main (tests/varinfo5so.c:157) + by 0x........: main (tests/varinfo5.c:5) Location 0x........ is 1 byte inside a[3].xyzzy[21].c2[2], declared at varinfo5so.c:135, in frame #1 of thread 1 answer is 0 Uninitialised byte(s) found during client check request - at 0x........: croak (memcheck/tests/varinfo5so.c:29) - by 0x........: fun_c (memcheck/tests/varinfo5so.c:164) - by 0x........: fun_b (memcheck/tests/varinfo5so.c:168) - by 0x........: fun_a (memcheck/tests/varinfo5so.c:172) - by 0x........: inlinetest (memcheck/tests/varinfo5so.c:178) - by 0x........: varinfo5_main (memcheck/tests/varinfo5so.c:158) - by 0x........: main (memcheck/tests/varinfo5.c:5) + at 0x........: croak (tests/varinfo5so.c:29) + by 0x........: fun_c (tests/varinfo5so.c:164) + by 0x........: fun_b (tests/varinfo5so.c:168) + by 0x........: fun_a (tests/varinfo5so.c:172) + by 0x........: inlinetest (tests/varinfo5so.c:178) + by 0x........: varinfo5_main (tests/varinfo5so.c:158) + by 0x........: main (tests/varinfo5.c:5) Address 0x........ is on thread 1's stack in frame #1, created by varinfo5_main (varinfo5so.c:153) diff --git a/memcheck/tests/varinfo5.vgtest b/memcheck/tests/varinfo5.vgtest index 8cf00eb2f9..063d00dce3 100644 --- a/memcheck/tests/varinfo5.vgtest +++ b/memcheck/tests/varinfo5.vgtest @@ -1,3 +1,3 @@ prog: varinfo5 -vgopts: --fullpath-after=${PWD}/ --read-var-info=yes --read-inline-info=yes -q +vgopts: --fullpath-after=memcheck/ --fullpath-after=coregrind/ --read-var-info=yes --read-inline-info=yes -q stderr_filter: filter_varinfo3