From 91e2ce6e76ad1a22f9770e65c02f7f527ef3abff Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 16 Mar 2013 00:59:17 +0100
Subject: tests: 96, 558, 1330: strip build subdirectory dependent leading path

---
 tests/data/test1330 |  5 +++--
 tests/data/test558  | 13 +++++++------
 tests/data/test96   |  5 +++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/data/test1330 b/tests/data/test1330
index 8f8f9674b..2aba0cecc 100644
--- 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 49d022610..f8cbfbe8d 100644
--- 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 9ea0ce752..865aff9c3 100644
--- 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>
 
-- 
cgit v1.2.3