Fixed runtime test hack I forgot to check in.

svn path=/rpkid/tests/yamltest-test-all.sh; revision=3354

1 files changed, 9 insertions, 8 deletions

diff --git a/rpkid/tests/yamltest-test-all.sh b/rpkid/tests/yamltest-test-all.sh
index b0a2045b..f6a05237 100644
--- a/rpkid/tests/yamltest-test-all.sh
+++ b/rpkid/tests/yamltest-test-all.sh
@@ -15,35 +15,36 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
  
-passes=10
-
 set -x
 
-export TZ=UTC MYRPKI_RNG=`pwd`/myrpki.rng
+export TZ=UTC MYRPKI_RNG=$(pwd)/myrpki.rng
 
-test -z "$STY"  && exec screen -L sh $0
+test -z "$STY" && exec screen -L sh $0
 
 screen -X split
 screen -X focus
 
+runtime=$((30 * 60))
+
 for yaml in smoketest.*.yaml
 do
   rm -rf test
   python sql-cleaner.py 
   screen python yamltest.py -p yamltest.pid $yaml
+  now=$(date +%s)
+  finish=$(($now + $runtime))
   date
   sleep 180
-  pass=$passes
-  while test $pass -gt 0
+  date
+  while test $(date +%s) -lt $finish
   do
-    pass=$(($pass - 1))
     sleep 30
     date
     ../../rcynic/rcynic
     ../../rcynic/show.sh
     date
   done
-  test -r yamltest.pid && kill -INT `cat yamltest.pid`
+  test -r yamltest.pid && kill -INT $(cat yamltest.pid)
   sleep 30
   make backup
 done