regress: enhance btape-test to detect NOT correct message

[bacula/bacula] / regress / tests / query-test

diff --git a/regress/tests/query-test b/regress/tests/query-test
index bb8febcbc94ae0b1859afee6f8014727f7f65443..2c0fd89e73343507dd7e11f8424685e2fa45ad14 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -1,17 +1,32 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of the Bacula build directory then create some           
 #   new files, do a Differental then a bunch of query commands
 #   and finally restore the two files.
 #
+
+
+# Query test no longer works because the query file is empty
+exit
+
+
+
+
+
+
 TestName="query-test"
 JobName=query
 . scripts/functions
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/tmp/build" >/tmp/file-list
-mkdir ${cwd}/tmp/build
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
+mkdir -p ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
 echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
@@ -21,10 +36,10 @@ cd ${cwd}
 change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
 label storage=File volume=TestVolume002
 run job=$JobName yes
@@ -40,16 +55,15 @@ stop_bacula
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @# Force differental on the second Volume
 update volume=TestVolume001 VolStatus=Used
-run level=differental job=$JobName yes
+run level=differential job=$JobName yes
 wait
 messages
-@output
 END_OF_DATA
 
 run_bacula
@@ -57,10 +71,10 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 run level=incremental job=$JobName yes
 wait
 messages
@@ -97,12 +111,11 @@ query
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
@@ -113,7 +126,7 @@ stop_bacula
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 
 check_two_logs
 check_restore_tmp_build_diff