From 254c50ff5fb7a3c37e58dee69efb3baa9d19e04b Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 6 Jun 2016 00:54:11 -0400 Subject: [PATCH] tests: use tar xf -, some tars default to tape dev. FreeBSD's tar defaults to reading from /dev/sa0 when no -f option is given, so turn "tar x" into "tar xf -" on j_corrupt_ext_jnl_sb_*. Signed-off-by: Matthias Andree Signed-off-by: Theodore Ts'o --- tests/j_corrupt_ext_jnl_sb_block/script | 2 +- tests/j_corrupt_ext_jnl_sb_csum/script | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/j_corrupt_ext_jnl_sb_block/script b/tests/j_corrupt_ext_jnl_sb_block/script index 02b8e650..11d3001b 100644 --- a/tests/j_corrupt_ext_jnl_sb_block/script +++ b/tests/j_corrupt_ext_jnl_sb_block/script @@ -9,7 +9,7 @@ fi cp /dev/null $OUT -bzip2 -dc < $test_dir/image.tar.bz2 | tar x +bzip2 -dc < $test_dir/image.tar.bz2 | tar xf - test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img "$JOURNAL_DUMP_DIR/$test_name.img" test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img.jnl "$JOURNAL_DUMP_DIR/$test_name.img.jnl" diff --git a/tests/j_corrupt_ext_jnl_sb_csum/script b/tests/j_corrupt_ext_jnl_sb_csum/script index 7a110bfa..45ddf6f4 100644 --- a/tests/j_corrupt_ext_jnl_sb_csum/script +++ b/tests/j_corrupt_ext_jnl_sb_csum/script @@ -9,7 +9,7 @@ fi cp /dev/null $OUT -bzip2 -dc < $test_dir/image.tar.bz2 | tar x +bzip2 -dc < $test_dir/image.tar.bz2 | tar xf - test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img "$JOURNAL_DUMP_DIR/$test_name.img" test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp $test_name.img.jnl "$JOURNAL_DUMP_DIR/$test_name.img.jnl" -- 2.11.0