Fixes for IRIX tape tests.

Added note about fsstress using a endian dependent random number generator.

diff --git a/022 b/022
index 31e04e105f2da109e5201166707cc8235f19706f..594d4fe873e26cea859a85dd613d60f3bed64e85 100755 (executable)
--- a/022
+++ b/022
@@ -60,6 +60,10 @@ _supported_fs xfs
 _supported_os IRIX 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.
 _create_dumpdir_stress
 _erase_hard
 _do_dump_sub

diff --git a/022.out.irix b/022.out.irix
index fc848aef33ba8382119969c967e0f583342218c6..354b8864a0e440dadf5e998d482abbc02e1997d8 100644 (file)
--- a/022.out.irix
+++ b/022.out.irix
@@ -22,7 +22,6 @@ xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
 xfsdump: preparing drive
 xfsdump: media block size: BLOCKSZ bytes
-xfsdump: media block size: BLOCKSZ bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
 xfsdump: dumping ino map
 xfsdump: dumping directories
@@ -49,7 +48,6 @@ xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
-xfsrestore: media block size: BLOCKSZ bytes
 xfsrestore: examining media file 0
 xfsrestore: reading directories
 xfsrestore: 28 directories and 100 entries processed

diff --git a/023.out.irix b/023.out.irix
index 1402c9dd3abaa7169343f5da837be06809b37e48..267c1a609df568b0f1d0b5274bcc55f504d3135e 100644 (file)
--- a/023.out.irix
+++ b/023.out.irix
@@ -19,7 +19,6 @@ xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
 xfsdump: preparing drive
 xfsdump: media block size: BLOCKSZ bytes
-xfsdump: media block size: BLOCKSZ bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
 xfsdump: dumping ino map
 xfsdump: dumping directories
@@ -46,7 +45,6 @@ xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: using online session inventory
 xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
-xfsrestore: media block size: BLOCKSZ bytes
 xfsrestore: examining media file 0
 xfsrestore: reading directories
 xfsrestore: 3 directories and 38 entries processed

diff --git a/025 b/025
index 4ce854dbb2425bf85b9cd3370fcda4f3eeb6bb2e..33a7a8a4e5a5ab4a34a71916a47ea849821193e0 100755 (executable)
--- a/025
+++ b/025
@@ -50,12 +50,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.dump
 
-# link correct .out file
-_link_out_file $seq.out
-
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $TAPE_DEV
 _create_dumpdir_fill

diff --git a/025.out b/025.out
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4d6515db3c6d2a414302fedf7f58b28b3b012ce9 100644 (file)
--- a/025.out
+++ b/025.out
@@ -0,0 +1,87 @@
+QA output created by 025
+Put scsi tape driver into variable block size mode
+Creating directory system to dump using src/fill.
+Setup ....................................
+Erasing tape
+Dumping to tape...
+xfsdump  -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT
+xfsdump: using minimum scsi tape (drive_minrmt) strategy
+xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
+xfsdump: dump date: DATE
+xfsdump: session id: ID
+xfsdump: session label: "stress_025"
+xfsdump: ino map phase 1: skipping (no subtrees specified)
+xfsdump: ino map phase 2: constructing initial dump list
+xfsdump: ino map phase 3: skipping (no pruning necessary)
+xfsdump: ino map phase 4: skipping (size estimated in phase 2)
+xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map construction complete
+xfsdump: estimated dump size: NUM bytes
+xfsdump: /var/xfsdump/inventory created
+xfsdump: preparing drive
+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: dump size (non-dir files) : NUM bytes
+xfsdump: dump complete: SECS seconds elapsed
+xfsdump: Dump Status: SUCCESS
+Rewinding tape
+Restoring from tape...
+xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_025 RESTORE_DIR
+xfsrestore: using minimum scsi tape (drive_minrmt) 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
+Only in SCRATCH_MNT: RESTORE_SUBDIR

diff --git a/025.out.irix b/025.out.irix
deleted file mode 100644 (file)
index 4d6515d..0000000
--- a/025.out.irix
+++ /dev/null
@@ -1,87 +0,0 @@
-QA output created by 025
-Put scsi tape driver into variable block size mode
-Creating directory system to dump using src/fill.
-Setup ....................................
-Erasing tape
-Dumping to tape...
-xfsdump  -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT
-xfsdump: using minimum scsi tape (drive_minrmt) strategy
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "stress_025"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: /var/xfsdump/inventory created
-xfsdump: preparing drive
-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: dump size (non-dir files) : NUM bytes
-xfsdump: dump complete: SECS seconds elapsed
-xfsdump: Dump Status: SUCCESS
-Rewinding tape
-Restoring from tape...
-xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_025 RESTORE_DIR
-xfsrestore: using minimum scsi tape (drive_minrmt) 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
-Only in SCRATCH_MNT: RESTORE_SUBDIR

diff --git a/025.out.linux b/025.out.linux
deleted file mode 100644 (file)
index 4d6515d..0000000
--- a/025.out.linux
+++ /dev/null
@@ -1,87 +0,0 @@
-QA output created by 025
-Put scsi tape driver into variable block size mode
-Creating directory system to dump using src/fill.
-Setup ....................................
-Erasing tape
-Dumping to tape...
-xfsdump  -m -b 1048576 -l0 -f TAPE_DEV -M stress_tape_media -L stress_025 SCRATCH_MNT
-xfsdump: using minimum scsi tape (drive_minrmt) strategy
-xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
-xfsdump: dump date: DATE
-xfsdump: session id: ID
-xfsdump: session label: "stress_025"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: /var/xfsdump/inventory created
-xfsdump: preparing drive
-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: dump size (non-dir files) : NUM bytes
-xfsdump: dump complete: SECS seconds elapsed
-xfsdump: Dump Status: SUCCESS
-Rewinding tape
-Restoring from tape...
-xfsrestore  -m -b 1048576 -f TAPE_DEV  -L stress_025 RESTORE_DIR
-xfsrestore: using minimum scsi tape (drive_minrmt) 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
-Only in SCRATCH_MNT: RESTORE_SUBDIR

diff --git a/035 b/035
index 6691dc0ac693762dbca617a760f88112a4a21827..4703c5ad3f6011d84e04bce026981f495b3191b5 100755 (executable)
--- a/035
+++ b/035
@@ -50,6 +50,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.dump
 
+# link correct .out file
+_link_out_file $seq.out
+
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux

diff --git a/035.out b/035.out
deleted file mode 100644 (file)
index 77ad736..0000000
--- a/035.out
+++ /dev/null
@@ -1,102 +0,0 @@
-QA output created by 035
-Put scsi tape driver into variable block size mode
-Creating directory system to dump using src/fill.
-Setup ....................................
-Erasing tape
-Dumping to tape...
-xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.1 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: "035.1"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: /var/xfsdump/inventory created
-xfsdump: preparing drive
-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
-Creating directory system to dump using src/fill.
-Setup ....
-Dumping to tape...
-xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.2 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: "035.2"
-xfsdump: ino map phase 1: skipping (no subtrees specified)
-xfsdump: ino map phase 2: constructing initial dump list
-xfsdump: ino map phase 3: skipping (no pruning necessary)
-xfsdump: ino map phase 4: skipping (size estimated in phase 2)
-xfsdump: ino map phase 5: skipping (only one dump stream)
-xfsdump: ino map construction complete
-xfsdump: estimated dump size: NUM bytes
-xfsdump: preparing drive
-xfsdump: positioned at media file 0: dump 0, stream 0
-xfsdump: positioned at media file 1: dump 0, stream 0
-xfsdump: positioned at media file 2: dump 0, stream 0
-xfsdump: stream terminator found
-xfsdump: creating dump session media file 0 (media 0, file 2)
-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 3)
-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 4)
-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 035.2 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: examining media file 1
-xfsrestore: examining media file 2
-xfsrestore: reading directories
-xfsrestore: 3 directories and 6 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/biggg and RESTORE_DIR/DUMP_SUBDIR/biggg are identical
-Files DUMP_DIR/smalll and RESTORE_DIR/DUMP_SUBDIR/smalll are identical
-Files DUMP_DIR/sub/biggg and RESTORE_DIR/DUMP_SUBDIR/sub/biggg are identical
-Files DUMP_DIR/sub/smalll and RESTORE_DIR/DUMP_SUBDIR/sub/smalll are identical
-Only in SCRATCH_MNT: RESTORE_SUBDIR

diff --git a/035.out.irix b/035.out.irix
new file mode 100644 (file)
index 0000000..1b321af
--- /dev/null
+++ b/035.out.irix
@@ -0,0 +1,102 @@
+QA output created by 035
+Creating directory system to dump using src/fill.
+Setup ....................................
+Erasing tape
+Dumping to tape...
+xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.1 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: "035.1"
+xfsdump: ino map phase 1: skipping (no subtrees specified)
+xfsdump: ino map phase 2: constructing initial dump list
+xfsdump: ino map phase 3: skipping (no pruning necessary)
+xfsdump: ino map phase 4: skipping (size estimated in phase 2)
+xfsdump: ino map phase 5: skipping (only one dump stream)
+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
+Creating directory system to dump using src/fill.
+Setup ....
+Dumping to tape...
+xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.2 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: "035.2"
+xfsdump: ino map phase 1: skipping (no subtrees specified)
+xfsdump: ino map phase 2: constructing initial dump list
+xfsdump: ino map phase 3: skipping (no pruning necessary)
+xfsdump: ino map phase 4: skipping (size estimated in phase 2)
+xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map construction complete
+xfsdump: estimated dump size: NUM bytes
+xfsdump: preparing drive
+xfsdump: positioned at media file 0: dump 0, stream 0
+xfsdump: positioned at media file 1: dump 0, stream 0
+xfsdump: positioned at media file 2: dump 0, stream 0
+xfsdump: stream terminator found
+xfsdump: creating dump session media file 0 (media 0, file 2)
+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 3)
+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 4)
+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 035.2 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: examining media file 1
+xfsrestore: examining media file 2
+xfsrestore: reading directories
+xfsrestore: 3 directories and 6 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/biggg and RESTORE_DIR/DUMP_SUBDIR/biggg are identical
+Files DUMP_DIR/smalll and RESTORE_DIR/DUMP_SUBDIR/smalll are identical
+Files DUMP_DIR/sub/biggg and RESTORE_DIR/DUMP_SUBDIR/sub/biggg are identical
+Files DUMP_DIR/sub/smalll and RESTORE_DIR/DUMP_SUBDIR/sub/smalll are identical
+Only in SCRATCH_MNT: RESTORE_SUBDIR

diff --git a/035.out.linux b/035.out.linux
new file mode 100644 (file)
index 0000000..77ad736
--- /dev/null
+++ b/035.out.linux
@@ -0,0 +1,102 @@
+QA output created by 035
+Put scsi tape driver into variable block size mode
+Creating directory system to dump using src/fill.
+Setup ....................................
+Erasing tape
+Dumping to tape...
+xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.1 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: "035.1"
+xfsdump: ino map phase 1: skipping (no subtrees specified)
+xfsdump: ino map phase 2: constructing initial dump list
+xfsdump: ino map phase 3: skipping (no pruning necessary)
+xfsdump: ino map phase 4: skipping (size estimated in phase 2)
+xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map construction complete
+xfsdump: estimated dump size: NUM bytes
+xfsdump: /var/xfsdump/inventory created
+xfsdump: preparing drive
+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
+Creating directory system to dump using src/fill.
+Setup ....
+Dumping to tape...
+xfsdump  -f TAPE_DEV -M stress_tape_media -L 035.2 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: "035.2"
+xfsdump: ino map phase 1: skipping (no subtrees specified)
+xfsdump: ino map phase 2: constructing initial dump list
+xfsdump: ino map phase 3: skipping (no pruning necessary)
+xfsdump: ino map phase 4: skipping (size estimated in phase 2)
+xfsdump: ino map phase 5: skipping (only one dump stream)
+xfsdump: ino map construction complete
+xfsdump: estimated dump size: NUM bytes
+xfsdump: preparing drive
+xfsdump: positioned at media file 0: dump 0, stream 0
+xfsdump: positioned at media file 1: dump 0, stream 0
+xfsdump: positioned at media file 2: dump 0, stream 0
+xfsdump: stream terminator found
+xfsdump: creating dump session media file 0 (media 0, file 2)
+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 3)
+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 4)
+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 035.2 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: examining media file 1
+xfsrestore: examining media file 2
+xfsrestore: reading directories
+xfsrestore: 3 directories and 6 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/biggg and RESTORE_DIR/DUMP_SUBDIR/biggg are identical
+Files DUMP_DIR/smalll and RESTORE_DIR/DUMP_SUBDIR/smalll are identical
+Files DUMP_DIR/sub/biggg and RESTORE_DIR/DUMP_SUBDIR/sub/biggg are identical
+Files DUMP_DIR/sub/smalll and RESTORE_DIR/DUMP_SUBDIR/sub/smalll are identical
+Only in SCRATCH_MNT: RESTORE_SUBDIR

diff --git a/043.out.irix b/043.out.irix
index 5daa6ed2b725bac04039b6a4b2e173a66000523c..a8e0976b1ce51e4b2b7a53cc25f2a2e11aa5daf9 100644 (file)
--- a/043.out.irix
+++ b/043.out.irix
@@ -19,7 +19,6 @@ xfsdump: estimated dump size: NUM bytes
 xfsdump: /var/xfsdump/inventory created
 xfsdump: preparing drive
 xfsdump: media block size: BLOCKSZ bytes
-xfsdump: media block size: BLOCKSZ bytes
 xfsdump: creating dump session media file 0 (media 0, file 0)
 xfsdump: dumping ino map
 xfsdump: dumping directories
@@ -45,7 +44,6 @@ xfsrestore  -f TAPE_DEV  -L stress_043 RESTORE_DIR
 xfsrestore: using scsi tape (drive_scsitape) strategy
 xfsrestore: searching media for dump
 xfsrestore: preparing drive
-xfsrestore: media block size: BLOCKSZ bytes
 xfsrestore: examining media file 0
 xfsrestore: found dump matching specified label:
 xfsrestore: hostname: HOSTNAME

diff --git a/common.dump b/common.dump
index 371e605041cfd4f64a0095ac3198ae6837167c03..4802fd3a1f579e088edd59c86ed4134288560f60 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -759,7 +759,7 @@ _ls_filter()
         /^c/ { date = $9; sub(date,"DATE"); print}
         /^d/ { size = $5; sub(size,"SIZE"); print}
         {print}' \
-  | sed -e 's/total [0-9][0-9]*/total TOTAL/' -e 's/[ \t][ \t]*/ /g'
+  | sed -e 's/total [0-9][0-9]*/total TOTAL/'
 }