tests: Normalize setup.journal.log and setup.server.log

These logs are saved in the sandbox to help debugging setup.
Normalize them to make them easier to read.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/test-common.sh b/tests/test-common.sh
index 4d071e0b7ee445550d19dd654f3603a7b07a8a39..35d716408ae583270c353594eb0c0136c35ddab6 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -204,7 +204,9 @@ begin_test()
        mv $data/lostitems $data/setup.lostitems
        >$data/lostitems
        mv $data/journal.log $data/setup.journal.log
+       normalize sandbox/var/empire/setup.journal.log
        mv $data/server.log $data/setup.server.log
+       normalize sandbox/var/empire/setup.server.log
     fi
     start_server
 }
@@ -241,6 +243,25 @@ cmp_out()
     done
 }
 
+normalize()
+{
+    local act="$1"
+    local nrm="${2-sandbox/normalized-${1##*/}}"
+
+    case "$act" in
+    *journal.log)
+       perl "$srcdir"/tests/normalize.pl -j "$act" ;;
+    *server.log)
+       perl "$srcdir"/tests/normalize.pl -s "$act" ;;
+    *.xdump)
+       perl "$srcdir"/tests/normalize.pl "$act" ;;
+    *.err)
+       perl -pe 's/\s+$/\n/;' -e "s,\Q$srcdir/tests\E,tests," "$act" ;;
+    *)
+       perl -pe 's/\s+$/\n/;' "$act" ;;
+    esac >"$nrm"
+}
+
 cmp_out1()
 {
     local i=$1 exp="${2-$testdir/${1##*/}}"
@@ -263,18 +284,7 @@ cmp_out1()
        esac
     fi
 
-    case "$i" in
-    */journal.log)
-       perl "$srcdir"/tests/normalize.pl -j "$act" ;;
-    */server.log)
-       perl "$srcdir"/tests/normalize.pl -s "$act" ;;
-    *.xdump)
-       perl "$srcdir"/tests/normalize.pl "$act" ;;
-    *.err)
-       perl -pe 's/\s+$/\n/;' -e "s,\Q$srcdir/tests\E,tests," "$act" ;;
-    *)
-       perl -pe 's/\s+$/\n/;' "$act" ;;
-    esac >"$nrm"
+    normalize "$act" "$nrm"
     if diff -u "$exp" "$nrm" >"$nrm.diff"
     then
        echo "$i OK"