From 21427d27a0781cde066d16d4959b5905ce6d0770 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 29 Sep 2003 15:01:55 +0000
Subject: [PATCH] Changes for FreeBSD and spell weird correctly

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@714 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/.cvsignore                |   2 +-
 regress/all-non-root-tests        |   4 +-
 regress/all-tape-and-file-tests   |   4 +-
 regress/scripts/bacula-sd.conf.in |  74 ++++++++++++++++++++++++++
 regress/tests/dev-test-root       |   1 +
 regress/tests/etc-test-root       |   1 +
 regress/tests/lib-test-root       |   1 +
 regress/tests/weird-files-test    |  68 ++++++++++++++++++++++++
 regress/tests/weird-files2-test   |  84 ++++++++++++++++++++++++++++++
 regress/weird-files.tar.gz        | Bin 0 -> 1510 bytes
 10 files changed, 234 insertions(+), 5 deletions(-)
 create mode 100644 regress/scripts/bacula-sd.conf.in
 create mode 100755 regress/tests/weird-files-test
 create mode 100755 regress/tests/weird-files2-test
 create mode 100644 regress/weird-files.tar.gz

diff --git a/regress/.cvsignore b/regress/.cvsignore
index 6f0d68f2ee..120006c649 100644
--- a/regress/.cvsignore
+++ b/regress/.cvsignore
@@ -1,7 +1,7 @@
 build
 bin
 test.out
-wierd-files
+weird-files
 diff
 tmp
 working
diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index aaf2356abc..2b2c48d34e 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -8,12 +8,12 @@ tests/verify-vol-test
 tests/sparse-test
 tests/compressed-test
 tests/sparse-compressed-test
-tests/wierd-files-test
+tests/weird-files-test
 tests/two-jobs-test
 tests/two-vol-test
 tests/six-vol-test
 tests/bscan-test
-tests/wierd-files2-test
+tests/weird-files2-test
 tests/concurrent-jobs-test
 tests/four-concurrent-jobs-test
 tests/bsr-opt-test
diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests
index 99a97e520f..857934410a 100755
--- a/regress/all-tape-and-file-tests
+++ b/regress/all-tape-and-file-tests
@@ -8,12 +8,12 @@ tests/verify-vol-test
 tests/sparse-test
 tests/compressed-test
 tests/sparse-compressed-test
-tests/wierd-files-test
+tests/weird-files-test
 tests/two-jobs-test
 tests/two-vol-test
 tests/six-vol-test
 tests/bscan-test
-tests/wierd-files2-test
+tests/weird-files2-test
 tests/concurrent-jobs-test
 tests/four-concurrent-jobs-test
 tests/bsr-opt-test
diff --git a/regress/scripts/bacula-sd.conf.in b/regress/scripts/bacula-sd.conf.in
new file mode 100644
index 0000000000..47422aa660
--- /dev/null
+++ b/regress/scripts/bacula-sd.conf.in
@@ -0,0 +1,74 @@
+#
+# Default Bacula Storage Daemon Configuration file
+#
+#  For Bacula release 1.32 (20 Sep 2003) -- redhat 9
+#
+# You may need to change the name of your tape drive
+#   on the "Archive Device" directive in the Device
+#   resource.  If you change the Name and/or the 
+#   "Media Type" in the Device resource, please ensure
+#   that dird.conf has corresponding changes.
+#
+
+Storage {                             # definition of myself
+  Name = rufus-sd
+  SDPort = 8103                  # Director's port      
+  WorkingDirectory = "/home/kern/bacula/regress/working"
+  Pid Directory = "/home/kern/bacula/regress/working"
+}
+
+#
+# List Directors who are permitted to contact Storage daemon
+#
+Director {
+  Name = rufus-dir
+  Password = "BzlEl8haeFmnv/Lv8V6zDzUBgFFQNsUtny6VkmccQpOy"
+}
+
+#
+# Devices supported by this Storage daemon
+# To connect, the Director's bacula-dir.conf must have the
+#  same Name and MediaType. 
+#
+
+Device {
+  Name = FileStorage
+  Media Type = File
+  Archive Device = @tmpdir@
+  LabelMedia = yes;                   # lets Bacula label unlabeled media
+  Random Access = Yes;
+  AutomaticMount = yes;               # when device opened, read it
+  RemovableMedia = no;
+  AlwaysOpen = no;
+}
+
+#Device {
+#  Name = DDS-4                        # 
+#  Media Type = DDS-4
+#  Archive Device = /dev/nst0
+#  AutomaticMount = yes;               # when device opened, read it
+#  AlwaysOpen = yes;
+#  RemovableMedia = yes;
+#}
+
+#
+# A very old Exabyte with no end of media detection
+#
+#Device {
+#  Name = "Exabyte 8mm"
+#  Media Type = "8mm"
+#  Archive Device = /dev/nst0
+#  Hardware end of medium = No;
+#  AutomaticMount = yes;               # when device opened, read it
+#  AlwaysOpen = Yes;
+#  RemovableMedia = yes;
+#}
+
+# 
+# Send all messages to the Director, 
+# mount messages also are sent to the email address
+#
+Messages {
+  Name = Standard
+  director = rufus-dir = all
+}
diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 5ede9e7c0b..a5a01c7400 100755
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -8,6 +8,7 @@ echo " "
 echo " === /dev save/restore test ==="
 echo " "
 echo " "
+UID=`/usr/bin/id -g`
 if [ $UID != 0 ] ; then
    echo " "
    echo "You must be root to run this test."
diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 72f40f9786..e5770209a3 100755
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -8,6 +8,7 @@ echo " "
 echo " === /etc save/restore test ==="
 echo " "
 echo " "
+UID=`/usr/bin/id -g`
 if [ $UID != 0 ] ; then
    echo " "
    echo "You must be root to run this test."
diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index 43aeb12eda..7e9c800445 100755
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -8,6 +8,7 @@ echo " "
 echo " === /lib save/restore test ==="
 echo " "
 echo " "
+UID=`/usr/bin/id -g`
 if [ $UID != 0 ] ; then
    echo " "
    echo "You must be root to run this test."
diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
new file mode 100755
index 0000000000..7237d40c3f
--- /dev/null
+++ b/regress/tests/weird-files-test
@@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory
+#   then restore it.
+#
+if test ! -d weird-files ; then
+   echo " "
+   echo "Weird files not configured. Test not run."
+   exit 0
+fi
+cwd=`pwd`
+scripts/copy-test-confs
+scripts/cleanup
+echo "${cwd}/weird-files" >/tmp/file-list
+bin/bacula stop 2>&1 >/dev/null
+bin/drop_sqlite_tables
+bin/make_sqlite_tables
+
+echo " "
+echo " "
+echo " === Starting weird filenames test ==="
+echo " === Starting weird filenames test ===" >>working/log
+echo " "
+
+bin/bacula start 2>&1 >/dev/null
+bin/console -c bin/console.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+label storage=File
+TestVolume001
+run job=NightlySave
+yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@output tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores current all
+yes
+wait
+messages
+@output
+quit
+END_OF_DATA
+bin/bacula stop 2>&1 >/dev/null
+${cwd}/bin/testls weird-files >${cwd}/tmp/original
+cd tmp/bacula-restores${cwd}
+${cwd}/bin/testls weird-files >${cwd}/tmp/restored
+cd ${cwd}
+grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+rstat=$?
+diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
+   echo " "
+   echo " "
+   echo "  !!!!! Weird files test failed!!! !!!!! "
+   echo "  !!!!! Weird files test failed!!! !!!!! " >>test.out
+   echo " "
+else
+   echo "  ===== Weird files test OK ===== "
+   echo "  ===== Weird files test OK ===== " >>test.out
+   cd ${cwd}
+   scripts/cleanup
+fi
diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
new file mode 100755
index 0000000000..a618c4e4c0
--- /dev/null
+++ b/regress/tests/weird-files2-test
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory
+#   then restore it.
+#
+if test ! -d weird-files ; then
+   echo " "
+   echo "weird files not configured. Test not run."
+   exit 0
+fi
+cwd=`pwd`
+scripts/copy-test-confs
+scripts/cleanup
+rm -rf weird-files2
+cp -a weird-files weird-files2
+echo "${cwd}/weird-files2" >/tmp/file-list
+bin/bacula stop 2>&1 >/dev/null
+bin/drop_sqlite_tables
+bin/make_sqlite_tables
+
+echo " "
+echo " "
+echo " === Starting weird filenames2 test ==="
+echo " === Starting weird filenames2 test ===" >>working/log
+echo " "
+
+bin/testls weird-files2 >${cwd}/tmp/original
+bin/bacula start 2>&1 >/dev/null
+bin/console -c bin/console.conf <<END_OF_DATA
+@output /dev/null
+messages
+@output tmp/log1.out
+label storage=File volume=TestVolume001
+run job=NightlySave yes
+wait
+messages
+@output
+quit
+END_OF_DATA
+#
+# Now mess up the a hard link, and a soft link
+#
+cd weird-files2
+rm -f hard-file2
+ln hard-file3 hard-file2
+rm -f soft-file2
+ln -s soft-file3 soft-file2
+cd ${cwd}
+bin/console -c bin/console.conf <<END_OF_DATA
+@output /dev/null
+messages
+@# 
+@# now do a restore
+@#
+@output tmp/log2.out
+restore where=
+5
+done
+yes
+wait
+messages
+@output
+quit
+END_OF_DATA
+bin/bacula stop 2>&1 >/dev/null
+bin/testls weird-files2 >${cwd}/tmp/restored
+grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+bstat=$?
+grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+rstat=$?
+diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
+if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
+   echo " "
+   echo " "
+   echo "  !!!!! Weird files2 test failed!!! !!!!! "
+   echo "  !!!!! Weird files2 test failed!!! !!!!! " >>test.out
+   echo " "
+else
+   echo "  ===== Weird files2 test OK ===== "
+   echo "  ===== Weird files2 test OK ===== " >>test.out
+   cd ${cwd}
+   scripts/cleanup
+   rm -rf weird-files2
+fi
diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0ecbe3fc7215241cdfc3dfc18801eaaf23de9be2
GIT binary patch
literal 1510
zcmV<C1sVDuiwFQhLU=y_1MOYQa@#f()mmSHri*L>3jpzGcg;*U?PM}tbUIyh14)p`
zu|%dM6p#PD0AxwfBca%kupQmAk!*?r%)@hVfqMx*n4+HJMX@r?WHb;6;Y2CnUI|f>
zAH6<d<bI(zk(uIjL@0BojF1?rLoqgu)ipw+dsCNR`&`@cSBi&-f14Ky@^4YD8`ON#
zGt;1=L^e05)NAv9+aQz>dBXb<|C~AgMV4_Xl)o3Kl0=RW>GKc$5^kLTKU+Az8$Wjs
z0Yf6ze_7RQz4Gt-ZNuyTYyMB2*$4egMydZj<%DOT{}iyMv8Y-gjkfFuFL;Nh8;c5y
zW>sl*Q8q|hv@*J}W9EFKo}*P!-Z#ir?nB@ZuNkra^|Yy08*6Y=Ev#p_r#5^%r<7`m
z|5PS@oG9doFu|D^AvVdYwV8P3O{RLbS?Nh_mbGb`$+pA0ewuGEtQ*&V%)eK*zns`s
zxX-bmHU4Aj5dU!>|4HT!ga0SMMgIp&zZt~(Z#L6;QTM+LaNYcW8~<h0c>&Fs6fpl!
zfeZZW7cl;3e*LF){O@Cs0{&0=-?86Y7|@-6_j&2~zq=c3PPzy1f3E*sAlOqIZS()w
z|HJ&BQLdc+X^O=O;D3LKr^OQgJwO&9jQ^hFHvYL(RE70_mBIL*1Tp_}T`ryMm$*mm
zdvx=E=Mz*2>iu8i0ge9&!2iMjZ85ul#M8p|+eWMZGrrTmRDy=}U!q|Cp8`Mr;B3E~
zH2K)f@(R7li#IU&zabpy-`Gtt@85H~=-<KXpK@6LO9IgUZR05aQ&u)NHSRkP(7OJA
zi2t|i|4ec}{?io6i5u7dk^lFQPP>Fw|MxXtN)q8F3f$*{T>K{(_<sr<*Z*kb?}3or
zhvfcE;FA8m#rEk1o#+3Ia7Ntxe<(wWapU?w8vny9ekg2?HU4)~S@WikHm)20C6QSs
zDe?1v!70rDlc0@%T$K1**MmCo&qDnN&!GM{30nAno1FiQ1^zkkp9Ej#zgg)f|0g;B
zA^#%<h5Fwli1}X>i)x5Ae1-QF{8OSbp_E_$W0Je^Uk=fkQvm-_{qOAU+$?%;<4XN|
z{$*GTrkRTXLH{Wb^Z!R(Eo;4AzwNn=EBW`qAEP1vn+b^j(jex4sOx<t|J+x7Gyg20
zn*?x}|0O}pKOLxzZv1C~e?fu&6o~m}1GUkOf4Svf0RJfv^PdXTMkoFS0sSXL%s(Hf
zjc)vJ$A5_b(;()5sCwH@{3{;#m!SV7IL-gzscuZqC19=mOBMEip`6n!%>TJyz<&~i
z{D0vy|NcqPJ9PNj-w2^HU~DTiHHXRoGl!~x?*^wOR?n?}Cj9)5a|!W(5?rtU{k|Wd
z|L+KA`uA^pUI@4{{yXU3h5vs1Kdb*7!klhg|7Y>vApCcH{+CJ~p8pyuAdLb1pX<Np
zg`hV5vu*uv(7#Xo6Pn2k;{PPrjrV@PKbyOIVOtDrb8XQ>v0Ay2e;kke=wqn8Up@Nm
z!Q6ReW#h<TJm1tsxeQ-7)wBD}r>DKdTtu<3rj8DbbvZ{(UTs!$A6{(A?Khx@+?1$x
z!AMm@q%k-y`hRl$i@pA37V^JRLH;iZ&h;P7^S7HpImx>t<#K!w>(k-zhyc1Q`SGdV
z-=T-?iSC?t$cx_}dlLHYyKA$qKAUi4-w*JB0dY6EoBZ;jDwiMneda&LKE}KJN<z**
zjs+<dG8>@}1NG+!JN?&H_0=-Rw&Sl9vHyE7z`r&4J^stokJ#T8_}8K~GpEo;{86t8
zrh8zv2hR4u`~WNt!14gB4!}R{fq&iuA8v-hHYEoHB;dcx{_ot)75)BSR4Um2B?VrB
z|8q&s{a=9pr@)K%|MyQ1rN4~cJU3mv<Hh;EfBwVyzk>h&kpwTn|HGayC;qR%|C0dx
zzgutcXMbr{zBB%!mCw?R*TsK({?Et!C;kunzo)_PoAMsbwbii51^@s6000000DSlO
M57A4ZDFAo?0H&KcCjbBd

literal 0
HcmV?d00001

-- 
2.39.5