tests: remove IRIX support from tests also supported on Linux

Many tests claimed (via _supported_os) to work on both Linux and IRIX.
Since IRIX is no longer supported by xfstests, update these to claim
Linux support only.  Then remove any obvious IRIX-specific logic in the
tests, and any IRIX-specific golden output files.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eric Biggers
2017-07-20 21:22:05 -07:00
committed by Eryu Guan
parent 0e3b0ab584
commit 2983eebf07
184 changed files with 175 additions and 13103 deletions
+3 -9
View File
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_test
[ -f core ] && rm -f core
@@ -72,14 +72,8 @@ test_done
echo "=== TEST 5 ==="
xfs_db -r -c 'inode 128' -c 'push' -c 'type' $TEST_DEV >$tmp.out 2>&1
test_done
# On IRIX we lose state after a "push" operation and don't
# know the type is still inode
# Probably not worth changing xfs_db on IRIX for this.
if [ "$HOSTOS" != "IRIX" ]; then
if ! grep -q "current type is \"inode\"" $tmp.out
then
cat $tmp.out
fi
if ! grep -q "current type is \"inode\"" $tmp.out; then
cat $tmp.out
fi
echo "=== TEST 6 ==="
+2 -4
View File
@@ -58,7 +58,7 @@ _populate_scratch()
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_scratch
_require_no_large_scratch_dev
@@ -67,9 +67,7 @@ rm -f $seqres.full
_populate_scratch
[ "$HOSTOS" = "Linux" ] && DF_PROG="$DF_PROG -P --block-size=512"
eval `$DF_PROG $SCRATCH_MNT 2>&1 \
eval `$DF_PROG -P --block-size=512 $SCRATCH_MNT 2>&1 \
| tail -1 | $AWK_PROG '{ printf "blocks=%u used=%u avail=%u\n", $3, $4, $5 }'`
echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seqres.full
echo "blocksize from mkfs is '$dbsize'" >>$seqres.full
+1 -1
View File
@@ -43,7 +43,7 @@ _cleanup()
# Modify as appropriate.
_supported_fs xfs
_supported_os Linux Irix
_supported_os Linux
_require_scratch
_require_xfs_quota
+1 -1
View File
@@ -86,7 +86,7 @@ _do_test()
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_test
rm -f $seqres.full
+1 -1
View File
@@ -76,7 +76,7 @@ _filesize()
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_scratch
+1 -1
View File
@@ -103,7 +103,7 @@ _do_test()
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_test
rm -f $seqres.full
+2 -6
View File
@@ -47,7 +47,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
# prelim
rm -f $seqres.full $tmp.*
_require_scratch
@@ -68,11 +68,7 @@ cat >$tmp.seq.params <<EOF
version=2 logbsize=256k
EOF
if [ "$HOSTOS" = "IRIX" ]; then
start_blk=0
else
start_blk=2
fi
start_blk=2
# do the work for various log params which
# should not effect the data content of the log
-1
View File
@@ -1,2 +1 @@
irix: irix
linux: linux
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -63,7 +63,7 @@ _filter_stat()
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_scratch
+2 -3
View File
@@ -43,13 +43,12 @@ _link_out_file
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_tape $TAPE_DEV
# note: fsstress uses an endian dependent random number generator, running this
# will produce different output for big/little endian machines. This issue was
# resolved by using different Linux/IRIX out files.
# will produce different output for big/little endian machines.
_create_dumpdir_stress
_erase_hard
_do_dump_sub
-1
View File
@@ -1,2 +1 @@
irix: irix
linux: linux
-55
View File
@@ -1,55 +0,0 @@
QA output created by 022
Creating directory system to dump using fsstress.
-----------------------------------------------
fsstress : -f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10
-----------------------------------------------
Erasing tape
Dumping to tape...
xfsdump -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_022 SCRATCH_MNT
xfsdump: using scsi tape (drive_scsitape) strategy
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_022"
xfsdump: ino map <PHASES>
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
xfsdump: preparing drive
xfsdump: media block size: BLOCKSZ bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
xfsdump: dumping ino map
xfsdump: dumping directories
xfsdump: dumping non-directory files
xfsdump: ending media file
xfsdump: media file size NUM bytes
xfsdump: dumping session inventory
xfsdump: beginning inventory media file
xfsdump: media file 1 (media 0, file 1)
xfsdump: ending inventory media file
xfsdump: inventory media file size NUM bytes
xfsdump: writing stream terminator
xfsdump: beginning media stream terminator
xfsdump: media file 2 (media 0, file 2)
xfsdump: ending media stream terminator
xfsdump: media stream terminator size BLOCKSZ bytes
xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS
Rewinding tape
Restoring from tape...
xfsrestore -f TAPE_DEV -L stress_022 RESTORE_DIR
xfsrestore: using scsi tape (drive_scsitape) strategy
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: preparing drive
xfsrestore: examining media file 0
xfsrestore: reading directories
xfsrestore: NUM directories and NUM entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS
Comparing listing of dump directory with restore directory
Files TMP.dump_dir and TMP.restore_dir are identical
+1 -1
View File
@@ -42,7 +42,7 @@ _link_out_file
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_tape $TAPE_DEV
_create_dumpdir_fill
-1
View File
@@ -1,2 +1 @@
irix: irix
linux: linux
-89
View File
@@ -1,89 +0,0 @@
QA output created by 023
Creating directory system to dump using src/fill.
Setup ....................................
Erasing tape
Dumping to tape...
xfsdump -s DUMP_SUBDIR -f TAPE_DEV -M stress_tape_media -L stress_023 SCRATCH_MNT
xfsdump: using scsi tape (drive_scsitape) strategy
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
xfsdump: session label: "stress_023"
xfsdump: ino map <PHASES>
xfsdump: ino map construction complete
xfsdump: estimated dump size: NUM bytes
xfsdump: /var/xfsdump/inventory created
xfsdump: preparing drive
xfsdump: media block size: BLOCKSZ bytes
xfsdump: creating dump session media file 0 (media 0, file 0)
xfsdump: dumping ino map
xfsdump: dumping directories
xfsdump: dumping non-directory files
xfsdump: ending media file
xfsdump: media file size NUM bytes
xfsdump: dumping session inventory
xfsdump: beginning inventory media file
xfsdump: media file 1 (media 0, file 1)
xfsdump: ending inventory media file
xfsdump: inventory media file size NUM bytes
xfsdump: writing stream terminator
xfsdump: beginning media stream terminator
xfsdump: media file 2 (media 0, file 2)
xfsdump: ending media stream terminator
xfsdump: media stream terminator size BLOCKSZ bytes
xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS
Rewinding tape
Restoring from tape...
xfsrestore -f TAPE_DEV -L stress_023 RESTORE_DIR
xfsrestore: using scsi tape (drive_scsitape) strategy
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: preparing drive
xfsrestore: examining media file 0
xfsrestore: reading directories
xfsrestore: 3 directories and 38 entries processed
xfsrestore: directory post-processing
xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS
Comparing dump directory with restore directory
Files DUMP_DIR/big and RESTORE_DIR/DUMP_SUBDIR/big are identical
Files DUMP_DIR/small and RESTORE_DIR/DUMP_SUBDIR/small are identical
Files DUMP_DIR/sub/a and RESTORE_DIR/DUMP_SUBDIR/sub/a are identical
Files DUMP_DIR/sub/a00 and RESTORE_DIR/DUMP_SUBDIR/sub/a00 are identical
Files DUMP_DIR/sub/a000 and RESTORE_DIR/DUMP_SUBDIR/sub/a000 are identical
Files DUMP_DIR/sub/b and RESTORE_DIR/DUMP_SUBDIR/sub/b are identical
Files DUMP_DIR/sub/b00 and RESTORE_DIR/DUMP_SUBDIR/sub/b00 are identical
Files DUMP_DIR/sub/big and RESTORE_DIR/DUMP_SUBDIR/sub/big are identical
Files DUMP_DIR/sub/c and RESTORE_DIR/DUMP_SUBDIR/sub/c are identical
Files DUMP_DIR/sub/c00 and RESTORE_DIR/DUMP_SUBDIR/sub/c00 are identical
Files DUMP_DIR/sub/d and RESTORE_DIR/DUMP_SUBDIR/sub/d are identical
Files DUMP_DIR/sub/d00 and RESTORE_DIR/DUMP_SUBDIR/sub/d00 are identical
Files DUMP_DIR/sub/e and RESTORE_DIR/DUMP_SUBDIR/sub/e are identical
Files DUMP_DIR/sub/e00 and RESTORE_DIR/DUMP_SUBDIR/sub/e00 are identical
Files DUMP_DIR/sub/e000 and RESTORE_DIR/DUMP_SUBDIR/sub/e000 are identical
Files DUMP_DIR/sub/f and RESTORE_DIR/DUMP_SUBDIR/sub/f are identical
Files DUMP_DIR/sub/f00 and RESTORE_DIR/DUMP_SUBDIR/sub/f00 are identical
Files DUMP_DIR/sub/g and RESTORE_DIR/DUMP_SUBDIR/sub/g are identical
Files DUMP_DIR/sub/g00 and RESTORE_DIR/DUMP_SUBDIR/sub/g00 are identical
Files DUMP_DIR/sub/h and RESTORE_DIR/DUMP_SUBDIR/sub/h are identical
Files DUMP_DIR/sub/h00 and RESTORE_DIR/DUMP_SUBDIR/sub/h00 are identical
Files DUMP_DIR/sub/h000 and RESTORE_DIR/DUMP_SUBDIR/sub/h000 are identical
Files DUMP_DIR/sub/i and RESTORE_DIR/DUMP_SUBDIR/sub/i are identical
Files DUMP_DIR/sub/i00 and RESTORE_DIR/DUMP_SUBDIR/sub/i00 are identical
Files DUMP_DIR/sub/j and RESTORE_DIR/DUMP_SUBDIR/sub/j are identical
Files DUMP_DIR/sub/j00 and RESTORE_DIR/DUMP_SUBDIR/sub/j00 are identical
Files DUMP_DIR/sub/k and RESTORE_DIR/DUMP_SUBDIR/sub/k are identical
Files DUMP_DIR/sub/k00 and RESTORE_DIR/DUMP_SUBDIR/sub/k00 are identical
Files DUMP_DIR/sub/k000 and RESTORE_DIR/DUMP_SUBDIR/sub/k000 are identical
Files DUMP_DIR/sub/l and RESTORE_DIR/DUMP_SUBDIR/sub/l are identical
Files DUMP_DIR/sub/l00 and RESTORE_DIR/DUMP_SUBDIR/sub/l00 are identical
Files DUMP_DIR/sub/m and RESTORE_DIR/DUMP_SUBDIR/sub/m are identical
Files DUMP_DIR/sub/m00 and RESTORE_DIR/DUMP_SUBDIR/sub/m00 are identical
Files DUMP_DIR/sub/n and RESTORE_DIR/DUMP_SUBDIR/sub/n are identical
Files DUMP_DIR/sub/n00 and RESTORE_DIR/DUMP_SUBDIR/sub/n00 are identical
Files DUMP_DIR/sub/small and RESTORE_DIR/DUMP_SUBDIR/sub/small are identical
Comparing listing of dump directory with restore directory
Files TMP.dump_dir and TMP.restore_dir are identical
+1 -1
View File
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_create_dumpdir_fill
_do_dump_file
+1 -1
View File
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_create_dumpdir_fill
_do_dump_restore
+1 -1
View File
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
# wipe test dir clean first
# so dump can be real quick
+1 -1
View File
@@ -67,7 +67,7 @@ _check_ag()
# real QA test starts here
_supported_fs xfs
_supported_os IRIX Linux
_supported_os Linux
_require_scratch
_require_no_large_scratch_dev

Some files were not shown because too many files have changed in this diff Show More