Fix merge issues.

Removed debug flag.
This commit is contained in:
ptools
2004-06-16 05:38:57 +00:00
parent f75038534f
commit 7facbfb74b
6 changed files with 42 additions and 81 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
#! /bin/sh -x
#! /bin/sh
# FS QA Test No. 027
#
# Test out "xfsdump | xfsrestore"
+36 -36
View File
@@ -299,9 +299,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 0
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -332,9 +332,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 1
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -359,9 +359,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 2
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -388,9 +388,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 3
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -422,9 +422,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 4
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -452,9 +452,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 5
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -483,9 +483,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 6
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -514,9 +514,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 7
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -540,9 +540,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 8
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -567,9 +567,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 0
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -608,9 +608,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 1
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -643,9 +643,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 2
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -678,9 +678,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 3
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -717,9 +717,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 4
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -752,9 +752,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 5
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -783,9 +783,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 6
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -814,9 +814,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 7
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
@@ -845,9 +845,9 @@ xfsrestore: session time: TIME
xfsrestore: level: 8
xfsrestore: session label: "stress_065"
xfsrestore: media label: "stress_tape_media"
xfsrestore: file system id: ID
xfsrestore: file system ID: ID
xfsrestore: session id: ID
xfsrestore: media id: ID
xfsrestore: media ID: ID
xfsrestore: using online session inventory
xfsrestore: searching media for directory dump
xfsrestore: reading directories
+1 -1
View File
@@ -1,4 +1,4 @@
#! /bin/sh -x
#! /bin/sh
# FS QA Test No. 067
#
# Test out acl/dacls which fit in shortform in the inode
-26
View File
@@ -8,45 +8,33 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
Writing 512 bytes, offset is +0 (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1 byte (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1 bytes (direct=false)
read 1/1 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is +0 (direct=true)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1FSB bytes (direct=true)
read 512/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is minus 1FSB (direct=true)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1FSB bytes (direct=true)
read 513/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
=== Iterating, 2 remains
@@ -55,39 +43,31 @@ Writing 512 bytes, offset is +0 (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1 byte (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 512 bytes (direct=false)
read 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1 bytes, offset is minus 1FSB (direct=false)
wrote 512/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Reading 1 bytes (direct=false)
read 1/1 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is +0 (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is minus 1FSB (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
=== Iterating, 1 remains
@@ -96,37 +76,31 @@ Writing 512 bytes, offset is +0 (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1 byte (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 512 bytes, offset is minus 1FSB (direct=false)
pwrite64: File too large
Reading 512 bytes (direct=false)
read 0/512 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1 bytes, offset is minus 1FSB (direct=false)
pwrite64: File too large
Reading 1 bytes (direct=false)
read 0/1 bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is +0 (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
Writing 1FSB bytes, offset is minus 1FSB (direct=true)
pwrite64: File too large
Reading 1FSB bytes (direct=true)
read 0/1FSB bytes at offset <OFFSET>
XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec
=== Iterating, 0 remains
+4 -4
View File
@@ -11,11 +11,11 @@ QA output created by 082
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.sync.filtered
--- mkfs=-lversion=2,su=36864, mnt=-ologbsize=32k, start=72, sync=sync ---
*** Cannot mkfs for this test using option specified: -lversion=2,su=36864 -lsize=2000b ***
*** Cannot mkfs for this test using option specified: -lversion=2,su=36864 -l size=2000b ***
--- mkfs=-lversion=2,su=5120, mnt=-ologbsize=32k, start=10, sync=sync ---
*** Cannot mkfs for this test using option specified: -lversion=2,su=5120 -lsize=2000b ***
*** Cannot mkfs for this test using option specified: -lversion=2,su=5120 -l size=2000b ***
--- mkfs=-lversion=2, mnt=-ologbsize=32k, start=2, sync=nosync ---
*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=2.nosync.filtered
@@ -31,10 +31,10 @@ QA output created by 082
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.nosync.filtered
--- mkfs=-lversion=2,su=36864, mnt=-ologbsize=32k, start=72, sync=nosync ---
*** Cannot mkfs for this test using option specified: -lversion=2,su=36864 -lsize=2000b ***
*** Cannot mkfs for this test using option specified: -lversion=2,su=36864 -l size=2000b ***
--- mkfs=-lversion=2,su=5120, mnt=-ologbsize=32k, start=10, sync=nosync ---
*** Cannot mkfs for this test using option specified: -lversion=2,su=5120 -lsize=2000b ***
*** Cannot mkfs for this test using option specified: -lversion=2,su=5120 -l size=2000b ***
*** unmount
-13
View File
@@ -162,9 +162,7 @@ if [ $os == "linux" ]; then
FULL_FSTYP_DETAILS=`_full_fstyp_details`
FULL_HOST_DETAILS=`_full_platform_details`
FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
@@ -181,17 +179,6 @@ if [ $os == "linux" ]; then
flag='-f'
fi
echo "MKFS_OPTIONS -- $FULL_MKFS_OPTIONS"
FULL_MOUNT_OPTIONS=`_scratch_mount_options`
cat <<EOF
FSTYP -- $FULL_FSTYP_DETAILS
PLATFORM -- $FULL_HOST_DETAILS
MKFS_OPTIONS -- $FULL_MKFS_OPTIONS
MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
EOF
umount $SCRATCH_DEV 2>/dev/null
# call the overridden mkfs.xfs - make sure the FS is built
# the same as we'll create it later.