X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fregexwhere-test;h=692bd60b3670e68199d04904710fc808baf0a10e;hb=1e11e29bf661a26cef2419a31d82b6657370f0af;hp=bfc7e486fe468983531000901b49de72a97327d1;hpb=6e4ba89e9e6ba16b6e5a10c2f283c8ddcaa67d05;p=bacula%2Fbacula diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test index bfc7e486fe..692bd60b36 100755 --- a/regress/tests/regexwhere-test +++ b/regress/tests/regexwhere-test @@ -13,7 +13,7 @@ scripts/copy-test-confs /bin/cp -f scripts/bacula-dir.conf.regexwhere bin/bacula-dir.conf -echo "${cwd}/build/po" >/tmp/file-list +echo "${cwd}/build/po" >tmp/file-list start_test @@ -143,7 +143,7 @@ mod @## Where m 9 -/tmp/bacula-restore-it +tmp/bacula-restore-it m @## use add suffix 10 @@ -182,7 +182,7 @@ fi J=JobB # $cwd begins with / if grep -q "Restore OK" tmp/RUN_$J && - grep -q "/tmp/bacula-restore${cwd}/po/fr.po.old" tmp/RUN_$J + grep -q "tmp/bacula-restore${cwd}/po/fr.po.old" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok else @@ -192,7 +192,7 @@ 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 -q "tmp/bacula-restore${cwd}/build/po/fr.po" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok else @@ -231,7 +231,7 @@ fi J=JobG if grep -q "Restore OK" tmp/RUN_$J && - grep -q "/tmp/bacula-restore/build/po/fr.po" tmp/RUN_$J + grep -q "tmp/bacula-restore/build/po/fr.po" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok else @@ -263,7 +263,7 @@ fi 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 -e "Where: *tmp/bacula-restore-it" tmp/RUN_$J && grep -q "${cwd}/build/po/fr.po.old" tmp/RUN_$J then [ "$debug" = 1 ] && echo $J ok