Add start/endtime

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1805 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/do_all b/regress/do_all
index ce86177ef9025433c13debf9eb2cca92a7bccb3f..1787b27a23cf68d4e3609fc90330e54e443a7990 100755 (executable)
--- a/regress/do_all
+++ b/regress/do_all
@@ -1,3 +1,5 @@
 #!/bin/sh
 make setup
-./all-tape-and-file-tests
+./starttime
+./all-non-root-tests
+./endtime

diff --git a/regress/endtime b/regress/endtime
new file mode 100755 (executable)
index 0000000..8a218b6
--- /dev/null
+++ b/regress/endtime
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+from time import time as now 
+ 
+t = now()
+fn = open('time.out', 'r')
+s = fn.readline()     
+fn.close()
+print 'Total time: %d secs' % (t - float(s))

diff --git a/regress/starttime b/regress/starttime
new file mode 100755 (executable)
index 0000000..5c2bd41
--- /dev/null
+++ b/regress/starttime
@@ -0,0 +1,6 @@
+#!/usr/bin/python
+from time import time as now 
+
+fn = open('time.out', 'w+')
+fn.write('%s' % now())
+fn.close()

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index d8512e2181c5c49dc251560c18bd5cb012629030..e382cafa22bd05614048ae980a0b774dd1b5337f 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -13,7 +13,8 @@ echo " === Starting Backup Bacula Test ==="
 echo " === Starting Backup Bacula Test ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
+#bin/bacula start 2>&1 >/dev/null
+bin/bacula start
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index c2c5eebbae653819f722ef1f66f35e01233267ad..5d97af5694bb4efec2d4cb004810b1619348a3b8 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -15,12 +15,13 @@ echo " === Starting compressed-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
+exit
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@tee /dev/null
 status all
 status all
 messages
-@output tmp/log1.out
+@tee tmp/log1.out
 label storage=File volume=TestVolume001
 run job=CompressedTest storage=File yes
 wait
@@ -28,7 +29,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@tee tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -36,7 +37,7 @@ done
 yes
 wait
 messages
-@output
+@tee
 quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=File