From 7c8ff8d470d2c995ffaaa1e37cf502cc388b9d24 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sat, 20 Nov 2010 23:35:03 +0100 Subject: [PATCH] regress: update delta test --- regress/tests/delta-test | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/regress/tests/delta-test b/regress/tests/delta-test index 2c27fa5210..857888147d 100755 --- a/regress/tests/delta-test +++ b/regress/tests/delta-test @@ -62,21 +62,12 @@ messages @# @$out ${cwd}/tmp/log2.out setdebug level=50 client=$CLIENT -restore where=$tmp jobid=1 -m * -done -yes -wait -messages -@exec "cp $tmp/delta.txt $tmp/delta.F.txt" -restore where=$tmp jobid=2 -m * -done +restore where=$tmp select all done yes wait messages -@exec "cp $tmp/delta.txt $tmp/delta.I1.txt" -restore where=$tmp jobid=3 +@exec "mv $tmp/delta.txt $tmp/delta.OK.txt" +restore where=$tmp jobid=1 m * done yes @@ -94,13 +85,18 @@ check_two_logs stop_bacula -head -c 300 /etc/passwd > $tmp/source +head -c 100 /etc/passwd > $tmp/source diff -u $tmp/source $tmp/delta.txt > $tmp/d if [ $? -ne 0 ]; then print_debug "ERROR: delta.txt and source are different, restore failed" - print_debug `cat $tmp/d` - cat -ev $tmp/delta.* dstat=1 fi +head -c 300 /etc/passwd > $tmp/source +diff -u $tmp/source $tmp/delta.OK.txt > $tmp/d +if [ $? -ne 0 ]; then + print_debug "ERROR: delta.OK.txt and source are different, restore failed" + dstat=2 +fi + end_test -- 2.39.5