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 7caf38f5288dfdef3a3e343083b197a293a5be71..ef84d5654009bcbf2678c5ed4b8fa74760d6b214 100755 (executable)
--- 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 93473f8b21060ef00d1e91d7b80adee5ac169b51..3ac3cf7102c14185998d39d0ebc7d37be4b931f4 100755 (executable)
--- 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 50b6474974bb2053d4dd42c0ff6463542d7ac23f..d02394be2a86d20f88739c42c31da6f57c13bc44 100755 (executable)
--- 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 72c81b8f8f4f25c42d311677852b11611cd70b73..95a220c3f430c7b3f73d2e75236f7fdf78b0245c 100755 (executable)
--- 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 f8dfc8f12e400b8fe74fd2cff0c47a18b594b5e8..e4376115099ae8dd0f2e5cf5e8477a8696e63ac2 100755 (executable)
--- 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