tests: 96, 558, 1330: strip build subdirectory dependent leading path

diff --git a/tests/data/test1330 b/tests/data/test1330
index 8f8f9674ba91bbcfbb1af24772db94a29704fbab..2aba0cecc43950c8f52210527b0a2091835a28f2 100644 (file)
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -37,13 +37,14 @@ nothing
 # Verify data after the test has been "shot"
 <verify>
 <file name="log/memdump" mode="text">
-MEM ../../../tests/unit/unit1330.c: malloc()
-MEM ../../../tests/unit/unit1330.c: free()
+MEM unit1330.c: malloc()
+MEM unit1330.c: free()
 </file>
 <stripfile>
 s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
+s:^(MEM )(.*/)(.*):$1$3:
 </stripfile>
 </verify>
 

diff --git a/tests/data/test558 b/tests/data/test558
index 49d02261099e74ed0fa61c43050e2c657a7ca2ef..f8cbfbe8de2229190917540dabbd3bc71fcd13b7 100644 (file)
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -35,17 +35,18 @@ nothing
 # Verify data after the test has been "shot"
 <verify>
 <file name="log/memdump" mode="text">
-MEM ../../../tests/libtest/lib558.c: malloc()
-MEM ../../../tests/libtest/lib558.c: free()
-MEM ../../lib/escape.c: malloc()
-MEM ../../lib/escape.c: realloc()
-MEM ../../lib/escape.c: realloc()
-MEM ../../lib/escape.c: free()
+MEM lib558.c: malloc()
+MEM lib558.c: free()
+MEM escape.c: malloc()
+MEM escape.c: realloc()
+MEM escape.c: realloc()
+MEM escape.c: free()
 </file>
 <stripfile>
 s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
+s:^(MEM )(.*/)(.*):$1$3:
 </stripfile>
 </verify>
 

diff --git a/tests/data/test96 b/tests/data/test96
index 9ea0ce752592739e8257a55f58888a52d2ab4ea2..865aff9c324b04f597fa5d03bb2459918e31a30d 100644 (file)
--- a/tests/data/test96
+++ b/tests/data/test96
@@ -31,12 +31,13 @@ curl memory tracking operational
 # Verify data after the test has been "shot"
 <verify>
 <file name="log/memdump" mode="text">
-MEM ../../src/tool_paramhlp.c
-MEM ../../src/tool_cfgable.c
+MEM tool_paramhlp.c
+MEM tool_cfgable.c
 </file>
 <stripfile>
 $_ = '' if (($_ !~ /tool_paramhlp/) && ($_ !~ /tool_cfgable/))
 s/:\d+.*//
+s:^(MEM )(.*/)(.*):$1$3:
 </stripfile>
 </verify>