diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-03-27 10:45:44 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-04-24 13:00:10 +0200 |
| commit | df9158f20d8950b996a3e9b5a4ac0f9b2ea034d3 (patch) | |
| tree | 9df6fe8baf8bb35eefe8f4cb80359f9309850487 /tests | |
| parent | de34a33a8204af9e675e5247c88eb727955beae1 (diff) | |
btrfs-progs: Remove deprecated btrfs-zero-log standalone tool
Its function has been subsumed by "btrfs rescue zero-log". Remove its
source file and adjust make/tests soruces accordingly.
Deprecated since 4.0.
Issue: #97
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/misc-tests.sh | 1 | ||||
| -rwxr-xr-x | tests/misc-tests/003-zero-log/test.sh | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh index 94703a3e..dad397ec 100755 --- a/tests/misc-tests.sh +++ b/tests/misc-tests.sh @@ -46,7 +46,6 @@ check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfstune check_prereq btrfs -check_prereq btrfs-zero-log check_prereq btrfs-find-root check_prereq btrfs-select-super check_kernel_support diff --git a/tests/misc-tests/003-zero-log/test.sh b/tests/misc-tests/003-zero-log/test.sh index b24616a9..c6742bf3 100755 --- a/tests/misc-tests/003-zero-log/test.sh +++ b/tests/misc-tests/003-zero-log/test.sh @@ -24,11 +24,7 @@ test_zero_log() --rootdir "$INTERNAL_BIN/Documentation" \ "$TEST_DEV" run_check "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV" - if [ "$1" = 'standalone' ]; then - run_check "$TOP/btrfs" rescue zero-log "$TEST_DEV" - else - run_check "$TOP/btrfs-zero-log" "$TEST_DEV" - fi + run_check "$TOP/btrfs" rescue zero-log "$TEST_DEV" log_root=$(get_log_root "$TEST_DEV") log_root_level=$(get_log_root "$TEST_DEV") if [ "$log_root" != 0 ]; then |