. scripts/functions
scripts/cleanup
-scripts/copy_test_confs
+scripts/copy-test-confs
/bin/cp -f scripts/bacula-dir.conf.regexwhere bin/bacula-dir.conf
-echo "${cwd}/build/po" >/tmp/file-list
+#
+# Remove the !restored from the messages resource because
+# this test needs the restored listing to verify the
+# restore results
+#
+outf="${cwd}/tmp/sed_tmp"
+echo "s%, \!restored%%g" >${outf}
+cp ${cwd}/bin/bacula-fd.conf ${cwd}/tmp/1
+sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-fd.conf
+
+echo "${cwd}/build/po" >tmp/file-list
start_test
messages
@##################################
@$out tmp/RUN_JobG
-restore strip_prefix="${cwd}" add_prefix="/tmp/bacula-restore"
+restore strip_prefix="${cwd}" add_prefix="${tmp}/bacula-restore.$$"
5
cd ${cwd}/build/po
m *.po
@## Where
m
9
-/tmp/bacula-restore-it
+tmp/bacula-restore-it
m
@## use add suffix
10
export rstat
J=JobA
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "${cwd}/build/po/fr.old.po" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "${cwd}/build/po/fr.old.po" tmp/RUN_$J > /dev/null
+
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobB
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "tmp/bacula-restore${cwd}/po/fr.po.old" tmp/RUN_$J > /dev/null
# $cwd begins with /
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "/tmp/bacula-restore${cwd}/po/fr.po.old" tmp/RUN_$J
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobC
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "/tmp/bacula-restore${cwd}/build/po/fr.po" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "tmp/bacula-restore${cwd}/build/po/fr.po" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobD
-if grep -q "Restore Error" tmp/RUN_$J
+grep "Restore Error" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobE
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "${cwd}/tmp/fr.po" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "${cwd}/tmp/fr.po" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobF
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "${cwd}/build/po/fr.po" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "${cwd}/build/po/fr.po" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobG
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "/tmp/bacula-restore/build/po/fr.po" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "tmp/bacula-restore.$$/build/po/fr.po" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
echo "$J in error"
rstat=1
fi
+rm -rf ${tmp}/bacula-restore.$$
J=JobH
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "${cwd}/build/po/fr.po.old" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
fi
J=JobI
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "${cwd}/build/po/fr.po.old" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
J=JobJ
-if grep -q "Restore OK" tmp/RUN_$J &&
- grep -q "/etc/passwd.old" tmp/RUN_$J &&
- grep -q -e "Where: */tmp/bacula-restore-it" tmp/RUN_$J &&
- grep -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J
+grep "Restore OK" tmp/RUN_$J > /dev/null && \
+grep "/etc/passwd.old" tmp/RUN_$J > /dev/null && \
+grep "Where: *tmp/bacula-restore-it" tmp/RUN_$J > /dev/null && \
+grep "${cwd}/build/po/fr.po.old" tmp/RUN_$J > /dev/null
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo $J ok
else
sed -e 's/[Rr][Ee][Aa][Dd][Mm][Ee]/readme/' -e 's/\([ch]\)$/.old.\1/' tmp/list > tmp/list.sed
./build/src/tools/bregtest -s -f tmp/list -e '/readme/readme/i,/([ch])$/.old.$1/' > tmp/list.bsed
-if diff tmp/list.bsed tmp/list.sed >/dev/null 2>&1
+diff tmp/list.bsed tmp/list.sed >/dev/null 2>&1
+if [ $? = 0 ]
then
[ "$debug" = 1 ] && echo bregtest ok
else