diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-09-01 18:03:14 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2015-09-01 14:52:09 +0200 |
| commit | 3ca185850bca6e227adf584851343dd69c2aaf05 (patch) | |
| tree | ea44743141810c0dbce4727b09dcf1a602bb9fd8 /tests/fsck-tests | |
| parent | 123f4bc78c6f62c49f841667884e87e7e39e307f (diff) | |
btrfs-progs: tests: Use --no-same-owner option for tar
Some test failed in my nfs dir:
...
[TEST] 006-bad-root-items
tar: test.img: Cannot change ownership to uid 1000, gid 1000: Invalid argument
tar: Exiting with failure status due to previous errors
failed to extract default_case.tar.xz
test failed for case 006-bad-root-items
It is because the image file's owner is:
# tar tvf default_case.tar.xz
-rw-r--r-- fdmanana/fdmanana 2147483648 2014-10-17 17:59 test.img
And make tar failed in chown in nfs.
It is not a big issue because we don't use nfs commonly, but extract
the image file with ownership of current user will be a better choice.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests/fsck-tests')
| -rwxr-xr-x | tests/fsck-tests/006-bad-root-items/test.sh | 4 | ||||
| -rwxr-xr-x | tests/fsck-tests/012-leaf-corruption/test.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/fsck-tests/006-bad-root-items/test.sh b/tests/fsck-tests/006-bad-root-items/test.sh index bfbfcfcc..421e2258 100755 --- a/tests/fsck-tests/006-bad-root-items/test.sh +++ b/tests/fsck-tests/006-bad-root-items/test.sh @@ -3,12 +3,12 @@ source $TOP/tests/common echo "extracting image default_case.tar.xz" >> $RESULTS -tar xJf default_case.tar.xz || \ +tar --no-same-owner -xJf default_case.tar.xz || \ _fail "failed to extract default_case.tar.xz" check_image test.img echo "extracting image skinny_case.tar.xz" >> $RESULTS -tar xJf skinny_case.tar.xz || \ +tar --no-same-owner -xJf skinny_case.tar.xz || \ _fail "failed to extract skinny_case.tar.xz" check_image test.img diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh index a37ceda7..6e231451 100755 --- a/tests/fsck-tests/012-leaf-corruption/test.sh +++ b/tests/fsck-tests/012-leaf-corruption/test.sh @@ -35,7 +35,7 @@ generate_leaf_corrupt_no_data_ext() { dest=$1 echo "generating leaf_corrupt_no_data_ext.btrfs-image" >> $RESULTS - tar xJf ./no_data_extent.tar.xz || \ + tar --no-same-owner -xJf ./no_data_extent.tar.xz || \ _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image" $TOP/btrfs-image -r test.img.btrfs-image $dest || \ _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image" |