From 8720e15cd1dc3993729141f54d2c6301cce4415a Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Fri, 3 Apr 2015 15:01:12 +0800 Subject: btrfs-progs: test-frame: Update variant names Use upper case variant name for the following variants: 1) top -> TOP 2) script_dir -> SCRIPT_DIR And change the following variant name: 1) RESULT -> RESULTS Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- tests/fsck-tests/006-bad-root-items/test.sh | 6 +++--- tests/fsck-tests/012-leaf-corruption/test.sh | 4 ++-- tests/fsck-tests/013-extent-tree-rebuild/test.sh | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'tests/fsck-tests') diff --git a/tests/fsck-tests/006-bad-root-items/test.sh b/tests/fsck-tests/006-bad-root-items/test.sh index 2c0e1c63..bfbfcfcc 100755 --- a/tests/fsck-tests/006-bad-root-items/test.sh +++ b/tests/fsck-tests/006-bad-root-items/test.sh @@ -1,13 +1,13 @@ #!/bin/bash -source $top/tests/common +source $TOP/tests/common -echo "extracting image default_case.tar.xz" >> $RESULT +echo "extracting image default_case.tar.xz" >> $RESULTS tar xJf default_case.tar.xz || \ _fail "failed to extract default_case.tar.xz" check_image test.img -echo "extracting image skinny_case.tar.xz" >> $RESULT +echo "extracting image skinny_case.tar.xz" >> $RESULTS tar 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 8f82fd16..fe5c2260 100755 --- a/tests/fsck-tests/012-leaf-corruption/test.sh +++ b/tests/fsck-tests/012-leaf-corruption/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -source $top/tests/common +source $TOP/tests/common # Check file list for leaf corruption, no regular/preallocated # file extent case. @@ -34,7 +34,7 @@ leaf_no_data_ext_list=( generate_leaf_corrupt_no_data_ext() { dest=$1 - echo "generating leaf_corrupt_no_data_ext.btrfs-image" >> $RESULT + echo "generating leaf_corrupt_no_data_ext.btrfs-image" >> $RESULTS tar xJf ./no_data_extent.tar.xz || \ _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image" btrfs-image -r test.img.btrfs-image $dest || \ diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh index 0542c279..cde97db3 100755 --- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh +++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -source $top/tests/common +source $TOP/tests/common if [ -z $TEST_DEV ]; then echo " [NOTRUN] extent tree rebuild, need TEST_DEV variant" @@ -16,32 +16,32 @@ fi test_extent_tree_rebuild() { echo " [TEST] extent tree rebuild" - $top/mkfs.btrfs -f $TEST_DEV >> /dev/null 2>&1 || _fail "fail to mkfs" + $TOP/mkfs.btrfs -f $TEST_DEV >> /dev/null 2>&1 || _fail "fail to mkfs" run_check mount $TEST_DEV $TEST_MNT cp -aR /lib/modules/`uname -r`/ $TEST_MNT 2>&1 for i in `seq 1 100`;do - $top/btrfs sub snapshot $TEST_MNT \ + $TOP/btrfs sub snapshot $TEST_MNT \ $TEST_MNT/snapaaaaaaa_$i >& /dev/null done run_check umount $TEST_DEV # get extent root bytenr - extent_root_bytenr=`$top/btrfs-debug-tree -r $TEST_DEV | \ + extent_root_bytenr=`$TOP/btrfs-debug-tree -r $TEST_DEV | \ grep extent | awk '{print $7}'` if [ -z $extent_root_bytenr ];then _fail "fail to get extent root bytenr" fi # corrupt extent root node block - run_check $top/btrfs-corrupt-block -l $extent_root_bytenr \ + run_check $TOP/btrfs-corrupt-block -l $extent_root_bytenr \ -b 4096 $TEST_DEV - $top/btrfs check $TEST_DEV >& /dev/null && \ + $TOP/btrfs check $TEST_DEV >& /dev/null && \ _fail "btrfs check should detect failure" - run_check $top/btrfs check --init-extent-tree $TEST_DEV - run_check $top/btrfs check $TEST_DEV + run_check $TOP/btrfs check --init-extent-tree $TEST_DEV + run_check $TOP/btrfs check $TEST_DEV } test_extent_tree_rebuild -- cgit v1.2.3