On Sun, Jan 29, 2017 at 03:56:20PM +0200, Omer Zilberberg wrote:
> fstest_dir is set after _cleanup() is defined and _require_test is
> called. If _require_test fails (due to some unrelated bug in tested FS),
> _cleanup will attempt to remove $fstest_dir.*, which expands to .*
> This has the unfortunate effect of removing xfstests' .git and
> .gitignore.
>
> Here is the 074.out.bad file for this case:
> QA output created by 074
> mount: permission denied
> common/rc: retrying test device mount with external set
> mount: permission denied
> common/rc: could not mount /dev/pmem0 on /mnt
> rm: refusing to remove '.' or '..' directory: skipping '.'
> rm: refusing to remove '.' or '..' directory: skipping '..'
> ----
>
> The only other test which could face the same problem is generic/285.
> However, that test defines _cleanup after the _require* calls, and so on
> _require_test failure, 285.out.bad contains the harmless:
> ./common/rc: line 1: _cleanup: command not found
How about defining fstest_dir before _cleanup function? Along with
"here" and "tmp", which looks clearer and makes more sense to me.
Thanks,
Eryu
>
> Signed-off-by: Omer Zilberberg <omzg@xxxxxxxxxxxxx>
> ---
> tests/generic/074 | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/generic/074 b/tests/generic/074
> index 55264bd..ef84263 100755
> --- a/tests/generic/074
> +++ b/tests/generic/074
> @@ -33,7 +33,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _cleanup()
> {
> - rm -rf $fstest_dir.* $tmp.*
> + [ -n "$fstest_dir" ] && rm -rf $fstest_dir.*
> + rm -rf $tmp.*
> }
>
> # get standard environment, filters and checks
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
