From c81ac4d3f0552402871b789d93e067be6aabced7 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 14 Mar 2008 08:45:15 +0000
Subject: [PATCH] Add runscript test

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6611 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/DartTestfile.txt.in  | 1 +
 regress/all-disk-tests       | 2 +-
 regress/all-non-root-tests   | 3 +--
 regress/tests/runscript-test | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
index f22c6a2a13..05b0d50a3d 100644
--- a/regress/DartTestfile.txt.in
+++ b/regress/DartTestfile.txt.in
@@ -32,6 +32,7 @@ ADD_TEST(all-non-root:regexwhere-test "@regressdir@/tests/regexwhere-test")
 ADD_TEST(all-non-root:restore2-by-file-test "@regressdir@/tests/restore2-by-file-test")
 ADD_TEST(all-non-root:restore-by-file-test "@regressdir@/tests/restore-by-file-test")
 ADD_TEST(all-non-root:restore-disk-seek-test "@regressdir@/tests/restore-disk-seek-test")
+ADD_TEST(all-non-root:runscript-test "@regressdir@/tests/runscript-test")
 ADD_TEST(all-non-root:scratch-pool-test "@regressdir@/tests/scratch-pool-test")
 ADD_TEST(all-non-root:six-vol-test "@regressdir@/tests/six-vol-test")
 ADD_TEST(all-non-root:span-vol-test "@regressdir@/tests/span-vol-test")
diff --git a/regress/all-disk-tests b/regress/all-disk-tests
index b0c2ea7b89..c281ab0414 100755
--- a/regress/all-disk-tests
+++ b/regress/all-disk-tests
@@ -35,7 +35,7 @@ nice tests/recycle-test
 nice tests/restore2-by-file-test
 nice tests/restore-by-file-test
 nice tests/restore-disk-seek-test
-#nice tests/runscript-test
+nice tests/runscript-test
 nice tests/six-vol-test
 nice tests/span-vol-test
 nice tests/maxvol-test
diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 626ae6b0e8..c281ab0414 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -35,8 +35,7 @@ nice tests/recycle-test
 nice tests/restore2-by-file-test
 nice tests/restore-by-file-test
 nice tests/restore-disk-seek-test
-# this test fails
-#nice tests/runscript-test
+nice tests/runscript-test
 nice tests/six-vol-test
 nice tests/span-vol-test
 nice tests/maxvol-test
diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index 137960e41a..3f15cb6444 100755
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -107,7 +107,7 @@ if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 -a $f = 0 ]
 then
    [ "$debug" = 1 ] && echo RUN_FD_FAILED ok
 else
-   echo "RUN_FD_FAILED in error"
+   echo "RUN_FD_FAILED in error a=$a b=$b c=$c d=$d e=$e f=$f"
    rstat=1
 fi
 
@@ -125,7 +125,7 @@ if [ $a = 0 -a $b != 0 -a $c = 0 -a $d = 0 -a $e = 0 ]
 then
    [ "$debug" = 1 ] && echo RUN_FD_FAILED ok
 else
-   echo "RUN_FD_FAILED2 in error"
+   echo "RUN_FD_FAILED2 in error a=$a b=$b c=$d d=$d e=$e"
    rstat=1
 fi
 
-- 
2.39.5