baculum: New reworked restore wizard

[bacula/bacula] / regress / rtest

diff --git a/regress/rtest b/regress/rtest
index b613b2ff4f8f240b6d86e8a059ccb48158a175bf..22498eb6c37842eef1b93d4095c0536711f4596c 100755 (executable)
--- a/regress/rtest
+++ b/regress/rtest
@@ -1,9 +1,18 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 # 
 #  Run a regression test script on a remote machine
 #
 #  called: rtest <machine> <branch> <test-script>
 #
+#  Since make setup is always called, you probably want
+#  to execute scripts that do not do the setup. If you do
+#  it just takes a bit longer, but there is no harm done.
+#
 #  Note: expects remote source to be in the same place
 #  as defined in regress/config on your calling machine
 #  Otherwise, you must define BACULA_SOURCE after the
@@ -27,8 +36,12 @@ ssh ${host} <<EOF
   git checkout ${branch}
   git pull
   cd ../regress
+  make setup
   ${run}
 EOF
 # Get test results
 scp ${host}:${BACULA_SOURCE}/../regress/test.out rtest.out
 cat rtest.out
+echo " "
+echo " "
+grep -e" \!\!\!\!" -e"===\ Test" test.out