From: ptools Date: Wed, 16 Jun 2004 05:38:57 +0000 (+0000) Subject: Fix merge issues. X-Git-Tag: v1.1.0~834 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7facbfb74ba5e731994abb7c314431e05190495f;p=users%2Fhch%2Fxfstests-dev.git Fix merge issues. Removed debug flag. --- diff --git a/027 b/027 index 9a242b5bb..cc331b6d8 100755 --- a/027 +++ b/027 @@ -1,4 +1,4 @@ -#! /bin/sh -x +#! /bin/sh # FS QA Test No. 027 # # Test out "xfsdump | xfsrestore" diff --git a/065.out b/065.out index 11854c0ca..b91934426 100644 --- a/065.out +++ b/065.out @@ -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 diff --git a/067 b/067 index 53603b55d..76e06cb23 100755 --- a/067 +++ b/067 @@ -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 diff --git a/071.out b/071.out index 26d45aa71..2ea0ef02a 100644 --- a/071.out +++ b/071.out @@ -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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 512 bytes (direct=false) read 512/512 bytes at 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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 512 bytes (direct=false) read 512/512 bytes at 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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 512 bytes (direct=false) read 512/512 bytes at 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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 1 bytes (direct=false) read 1/1 bytes at 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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 1FSB bytes (direct=true) read 512/1FSB bytes at 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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 1FSB bytes (direct=true) read 513/1FSB bytes at 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 -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 -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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 512 bytes (direct=false) read 512/512 bytes at 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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec Reading 1 bytes (direct=false) read 1/1 bytes at 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 -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 -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 -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 -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 -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 -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 -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 -XXX bytes, X ops; XXX sec (X YYY/sec and XXX ops/sec === Iterating, 0 remains diff --git a/082.out b/082.out index fd68a1a39..daa829752 100644 --- a/082.out +++ b/082.out @@ -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 diff --git a/check b/check index 36c996c37..29c4285f1 100755 --- a/check +++ b/check @@ -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 </dev/null # call the overridden mkfs.xfs - make sure the FS is built # the same as we'll create it later.