regress: Enhance jlist-test

diff --git a/regress/tests/jlist-test b/regress/tests/jlist-test
index 7d1ae9c1bc1328973122320d8f73feaa514a8b3d..eda6c20496b527f2f13c2c661b222d9759bc510e 100755 (executable)
--- a/regress/tests/jlist-test
+++ b/regress/tests/jlist-test
@@ -23,40 +23,26 @@ run job=BackupClient1 level=Full yes
 run job=BackupClient1 level=Full yes
 wait
 messages
-EOF
-
-run_bacula
-
-cat <<EOF > $tmp/bconcmds
 gui on
+@$out $tmp/log1.log
 .jlist events
-EOF
-
-run_bconsole | grep '^\[' > $tmp/log1.json
-
-cat <<EOF > $tmp/bconcmds
-gui on
+@$out $tmp/log2.log
 .jlist events limit=1
-EOF
-
-run_bconsole | grep '^\[' > $tmp/log2.json
-
-cat <<EOF > $tmp/bconcmds
-gui on
+@$out $tmp/log3.log
 .jlist jobs
-EOF
-
-run_bconsole | grep '^\[' > $tmp/log3.json
-
-cat <<EOF > $tmp/bconcmds
-gui on
+@$out $tmp/log4.log
 .jlist joblog jobid=1
 EOF
 
-run_bconsole | grep '^\[' > $tmp/log4.json
+run_bacula
 
 for i in 1 2 3 4; do
+    grep '\[' $tmp/log$i.log > $tmp/log$i.json
     $bperl -e "check_json('$tmp/log$i.json')"
+    if [ $? != 0 ]; then
+        print_debug "ERROR: Unable to validate $tmp/log$i.log"
+        estat=1
+    fi
 done
 
 stop_bacula