From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 24 Sep 2007 17:24:12 +0000 (+0000)
Subject: Fix restore by file tests
X-Git-Tag: Release-7.0.0~5619
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=413c4bb779894fd017bfe789edc5e780f843b8aa;p=bacula%2Fbacula

Fix restore by file tests

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

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 7caf38f528..ef84d56540 100755
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -12,7 +12,7 @@ JobName=restorebyfile
 copy_tape_confs
 
 echo "${cwd}/build" >/tmp/file-list
-sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
+sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 93473f8b21..3ac3cf7102 100755
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -16,7 +16,7 @@ cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp/build
 ls >../1
 cd ..
-sed s%\^%${cwd}/tmp/build/% 1 >restore-list
+sed s%\^%${cwd}/tmp/build/% 1 | sort | uniq >restore-list
 rm -f 1
 cd ${cwd}
 
diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 50b6474974..d02394be2a 100755
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -25,7 +25,7 @@ done
 cd ${cwd}/tmp/build
 ls >../1
 cd ..
-sed s%\^%${cwd}/tmp/build/% 1 >restore-list
+sed s%\^%${cwd}/tmp/build/% 1 | sort | uniq >restore-list
 #
 # At this point restore-list contains the list
 #  of files we will restore
diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape
index 72c81b8f8f..95a220c3f4 100755
--- a/regress/tests/restore-seek-tape
+++ b/regress/tests/restore-seek-tape
@@ -24,7 +24,7 @@ done
 cd ${cwd}/tmp/build
 ls >../1
 cd ..
-sed s%\^%${cwd}/tmp/build/% 1 >restore-list
+sed s%\^%${cwd}/tmp/build/% 1 | sort | uniq >restore-list
 #
 # At this point restore-list contains the list
 #  of files we will restore
diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index f8dfc8f12e..e437611509 100755
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -9,7 +9,7 @@ JobName=restore2byfile
 copy_test_confs
 
 echo "${cwd}/build" >/tmp/file-list
-sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
+sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list
 
 change_jobname CompressedTest $JobName
 start_test