diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2005-06-16 15:08:00 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2005-06-16 15:08:00 -0400 |
| commit | d82f890355274ee7ede4ed0465b0d232da78d03c (patch) | |
| tree | 1fd696eddb99a427627fe7463499b82752c5393c /tests | |
| parent | d7febfa7cccf21f4f991bcea6174a11b3cf564c9 (diff) | |
| download | e2fsprogs-d82f890355274ee7ede4ed0465b0d232da78d03c.tar.gz | |
defaults/e_script, run_e2fsck, d_loaddump, f_resize_inode,
f_swapfs, f_move_itable, f_resize_inode, test_config:
Allow the diff options to be set in test_config so that
diff -u can be used on platforms that have it. (To be
done: checking whether diff can support -u in the
configure script.)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 9 | ||||
| -rw-r--r-- | tests/d_loaddump/script | 2 | ||||
| -rw-r--r-- | tests/defaults/e_script | 2 | ||||
| -rw-r--r-- | tests/f_resize_inode/script | 2 | ||||
| -rw-r--r-- | tests/f_swapfs/script | 2 | ||||
| -rw-r--r-- | tests/r_move_itable/script | 2 | ||||
| -rw-r--r-- | tests/r_resize_inode/script | 2 | ||||
| -rw-r--r-- | tests/run_e2fsck | 4 | ||||
| -rw-r--r-- | tests/test_config | 1 |
9 files changed, 18 insertions, 8 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index a1819f1e..7ac22550 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,12 @@ +2005-06-16 Theodore Ts'o <tytso@mit.edu> + + * defaults/e_script, run_e2fsck, d_loaddump, f_resize_inode, + f_swapfs, f_move_itable, f_resize_inode, test_config: + Allow the diff options to be set in test_config so that + diff -u can be used on platforms that have it. (To be + done: checking whether diff can support -u in the + configure script.) + 2005-04-14 Theodore Ts'o <tytso@mit.edu> * f_dup_resize: New test case diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script index 2fd5969e..57f377c6 100644 --- a/tests/d_loaddump/script +++ b/tests/d_loaddump/script @@ -54,7 +54,7 @@ if [ "$status" = 0 ] ; then touch $test_name.ok else echo "failed" - diff -c $EXP $OUT > $test_name.failed + diff $DIFF_OPTS $EXP $OUT > $test_name.failed fi unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA diff --git a/tests/defaults/e_script b/tests/defaults/e_script index 3318ae71..b9150ba7 100644 --- a/tests/defaults/e_script +++ b/tests/defaults/e_script @@ -41,7 +41,7 @@ if [ "$status" = 0 ] ; then touch $test_name.ok else echo "failed" - diff -c $EXPECT $OUT > $test_name.failed + diff $DIFF_OPTS $EXPECT $OUT > $test_name.failed fi unset EXPECT OUT class instance diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script index bb4684f9..558bd4a0 100644 --- a/tests/f_resize_inode/script +++ b/tests/f_resize_inode/script @@ -132,7 +132,7 @@ if [ "$status" = 0 ] ; then touch $test_name.ok else echo "failed" - diff -c $EXP $OUT > $test_name.failed + diff $DIFF_OPTS $EXP $OUT > $test_name.failed rm -f tmp_expect fi diff --git a/tests/f_swapfs/script b/tests/f_swapfs/script index c41bec7e..75f9fb42 100644 --- a/tests/f_swapfs/script +++ b/tests/f_swapfs/script @@ -68,7 +68,7 @@ if $FSCK -SV > /dev/null 2>&1 ; then touch $test_name.ok else echo "failed" - diff -c $EXP $OUT > $test_name.failed + diff $DIFF_OPTS $EXP $OUT > $test_name.failed fi unset IMAGE VERIFY_FSCK_OPT SWAP_FSCK_OPT NATIVE_FSCK_OPT OUT EXP diff --git a/tests/r_move_itable/script b/tests/r_move_itable/script index 6603bb57..fe6cbb50 100644 --- a/tests/r_move_itable/script +++ b/tests/r_move_itable/script @@ -103,7 +103,7 @@ if [ "$status" = 0 ] ; then touch $test_name.ok else echo "failed" - diff -c $EXP $OUT > $test_name.failed + diff $DIFF_OPTS $EXP $OUT > $test_name.failed rm -f tmp_expect fi diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script index ce5a1333..60cf9b28 100644 --- a/tests/r_resize_inode/script +++ b/tests/r_resize_inode/script @@ -90,7 +90,7 @@ if [ "$status" = 0 ] ; then touch $test_name.ok else echo "failed" - diff -c $EXP $OUT > $test_name.failed + diff $DIFF_OPTS $EXP $OUT > $test_name.failed rm -f tmp_expect fi diff --git a/tests/run_e2fsck b/tests/run_e2fsck index e76bfae6..01203750 100644 --- a/tests/run_e2fsck +++ b/tests/run_e2fsck @@ -83,9 +83,9 @@ if [ "$SKIP_VERIFY" != "true" ] ; then touch $test_name.ok else echo "failed" - diff -c $EXP1 $OUT1 > $test_name.failed + diff $DIFF_OPTS $EXP1 $OUT1 > $test_name.failed if [ "$ONE_PASS_ONLY" != "true" ]; then - diff -c $EXP2 $OUT2 >> $test_name.failed + diff $DIFF_OPTS $EXP2 $OUT2 >> $test_name.failed fi fi rm -f tmp_expect diff --git a/tests/test_config b/tests/test_config index 6ee2cc29..a484d8b5 100644 --- a/tests/test_config +++ b/tests/test_config @@ -15,6 +15,7 @@ TEST_ICOUNT=../tests/progs/test_icount LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss TMPFILE=./test.img +DIFF_OPTS=-c export LD_LIBRARY_PATH export DYLD_LIBRARY_PATH TZ=GMT |