Fix not expressions

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

diff --git a/regress/freebsd.conf b/regress/freebsd.conf
new file mode 100644 (file)
index 0000000..3d41bd0
--- /dev/null
+++ b/regress/freebsd.conf
@@ -0,0 +1,26 @@
+# Where to get the source to be tested
+# BACULA_SOURCE="${HOME}/bacula/branch-1.36.2"
+BACULA_SOURCE="${HOME}/bacula/k"
+
+# Where to send email   !!!!! Change me !!!!!!!
+EMAIL=kern@sibbald.com
+SMTP_HOST="matou.sibbald.com"
+
+# Full "default" path where to find sqlite (no quotes!)
+SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
+
+TAPE_DRIVE="/dev/nsa0"
+# if you don't have an autochanger set AUTOCHANGER to /dev/null
+AUTOCHANGER="/dev/sg0"
+# For two drive tests -- set to /dev/null if you do not have it
+TAPE_DRIVE1="/dev/null"
+
+# This must be the path to the autochanger including its name
+AUTOCHANGER_PATH="/usr/local/sbin/mtx"
+
+# Set your database here
+WHICHDB?="--with-sqlite=${SQLITE_DIR}"
+#WHICHDB="--with-mysql=${HOME}/mysql"
+
+# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
+TCPWRAPPERS="--with-tcp-wrappers"

diff --git a/regress/kern.conf b/regress/kern.conf
index 55d6030c5ca70ab753961cdc963f8618e9b25d1b..e497babd4c1141663375833f15ccfa20affa5d0e 100644 (file)
--- a/regress/kern.conf
+++ b/regress/kern.conf
@@ -7,6 +7,7 @@ EMAIL=kern@sibbald.com
 SMTP_HOST="localhost"
 
 # Full "default" path where to find sqlite (no quotes!)
+#SQLITE_DIR=${HOME}/bacula/depkgs/sqlite3
 SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
 
 TAPE_DRIVE="/dev/nst0"
@@ -19,6 +20,7 @@ TAPE_DRIVE1="/dev/nst1"
 AUTOCHANGER_PATH="/usr/sbin/mtx"
 
 # Set your database here
+#SQLITE_DIR=${HOME}/bacula/depkgs/sqlite3
 WHICHDB?="--with-sqlite=${SQLITE_DIR}"
 #WHICHDB="--with-mysql=${HOME}/mysql"
 

diff --git a/regress/scripts/cleanup-2drive.in b/regress/scripts/cleanup-2drive.in
index b15c3a93f90e6e559b623fd0a1f1e65779ccc927..32b27c019e0fd439ce706fa2ee805d93dde619c2 100755 (executable)
--- a/regress/scripts/cleanup-2drive.in
+++ b/regress/scripts/cleanup-2drive.in
@@ -4,23 +4,23 @@
 #
 scripts/cleanup
 
-if test ! x@autochanger@ = x/dev/null; then
+if test x@autochanger@ != x/dev/null; then
    slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1`
    echo "Slot $slot in drive 1"
-   if test ! x$slot = x0 ; then
+   if test x$slot != x0 ; then
       echo "unload slot $slot in drive 1"
       bin/mtx-changer @autochanger@ unload $slot @tape_drive1@ 1
    fi
    slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0`
    echo "Slot $slot in drive 0"
-   if test ! x$slot = x0 ; then
+   if test x$slot != x0 ; then
       echo "unload slot $slot in drive 0"
       bin/mtx-changer @autochanger@ unload $slot @tape_drive@ 0
    fi
 
 
    slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1`
-   if test ! x$slot = x2; then
+   if test x$slot != x2; then
       echo "load slot 2 in drive 1"
       bin/mtx-changer @autochanger@ load 2 @tape_drive1@ 1
    fi
@@ -32,7 +32,7 @@ if test ! x@autochanger@ = x/dev/null; then
 
    slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0`
    echo "Slot $slot in drive 0"
-   if test ! x$slot = x1; then
+   if test x$slot != x1; then
       echo "load slot 1 in drive 0"
       bin/mtx-changer @autochanger@ load 1 @tape_drive@ 0
    fi

diff --git a/regress/scripts/cleanup-2tape.in b/regress/scripts/cleanup-2tape.in
index e28d3468e8fea27f32b61e8a046911ef984d3ce6..647c4b966053f0f7f89d19cdcc16998b09b2b1da 100755 (executable)
--- a/regress/scripts/cleanup-2tape.in
+++ b/regress/scripts/cleanup-2tape.in
@@ -4,9 +4,9 @@
 #
 scripts/cleanup
 
-if test ! x@autochanger@ = x/dev/null; then
+if test x@autochanger@ != x/dev/null; then
    drive=`bin/mtx-changer @autochanger@ loaded`
-   if test ! x${drive} = x2; then
+   if test x${drive} != x2; then
       bin/mtx-changer @autochanger@ unload 0 @tape_drive@ 0
       bin/mtx-changer @autochanger@ load 2 @tape_drive@ 0
    fi
@@ -18,9 +18,9 @@ fi
 #
 # If we have an autochanger always load tape in slot 1
 #
-if test ! x@autochanger@ = x/dev/null; then
+if test x@autochanger@ != x/dev/null; then
    drive=`bin/mtx-changer @autochanger@ loaded`
-   if test ! x${drive} = x1; then
+   if test x${drive} != x1; then
       bin/mtx-changer @autochanger@ unload 0 @tape_drive@ 0
       bin/mtx-changer @autochanger@ load 1 @tape_drive@ 0
    fi