From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 15 Sep 2006 13:28:11 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-2.0.0~446
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cb3ce2b283777749a28f0c7de970c7d690701b7b;p=bacula%2Fbacula

Update


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

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index e782ca2422..a9dd36cb72 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -33,6 +33,7 @@ tests/weird-files-test
 tests/migration-job-test
 tests/migration-volume-test
 tests/migration-time-test
+tests/hardlink-test
 # 
 # The following are Virtual Disk Autochanger tests
 tests/two-pool-test
diff --git a/regress/tests/hardlink-test b/regress/tests/hardlink-test
new file mode 100755
index 0000000000..42e38bcdde
--- /dev/null
+++ b/regress/tests/hardlink-test
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Run a simple backup of the Bacula build directory
+#   then restore it.
+#
+TestName="hardlink-test"
+JobName=hardlink
+. scripts/functions
+set_debug 0
+
+if test ! -d weird-files ; then
+   echo " "
+   echo "Weird files not configured. Test not run."
+   exit 0
+fi
+
+cwd=`pwd`
+scripts/cleanup
+scripts/copy-test-confs
+change_jobname NightlySave $JobName
+#
+# Note, we save the weird-files directory twice on purpose
+#  because this causes problems with hard linked files 
+#  that are only saved once.  In 1.33, Bacula now deals
+#  with this situation.
+#
+echo "${cwd}/weird-files" >/tmp/file-list
+echo "${cwd}/weird-files" >>/tmp/file-list
+
+start_test
+
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
+messages
+@$out tmp/log1.out
+label storage=File
+TestVolume001
+run job=$JobName    
+yes
+wait
+messages
+@# 
+@# now do a restore
+@#
+@$out tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores storage=File
+5
+cd ${cwd}/weird-files/subdir
+mark another-hardlink      
+done
+yes
+wait
+messages
+@$out
+quit
+END_OF_DATA
+
+run_bacula
+check_for_zombie_jobs storage=File 
+stop_bacula
+
+check_two_logs
+diff ${cwd}/weird-files/subdir/another-hardlink \
+  ${cwd}/tmp/bacula-restores/${cwd}/weird-files/subdir/another-hardlink 2>&1 >/dev/null
+dstat=$?
+end_test
diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz
index 94a12dd317..78f715816e 100644
Binary files a/regress/weird-files.tar.gz and b/regress/weird-files.tar.gz differ