mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Fix some regexps in xfstests
Fix regexp for xvm devices
This commit is contained in:
@@ -97,14 +97,14 @@ setquota -$type $id 1001 1001 10 10 $SCRATCH_DEV
|
||||
|
||||
# cross check blks, softblks, hardblks <-> quota, xfs_db
|
||||
quota -$type $id | tee -a $seq.full | perl -ne '
|
||||
if (m,^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+), ||
|
||||
if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)] ||
|
||||
($next == 1 && m,^\s+(\d+)\s+(\d+)\s+(\d+),)) {
|
||||
print "used_blocks=", $1, "\n";
|
||||
print "soft_blocks=", $2, "\n";
|
||||
print "hard_blocks=", $3, "\n";
|
||||
$next = 0;
|
||||
}
|
||||
elsif (m,^\s*'$SCRATCH_DEV',) { # devfs (long) names
|
||||
elsif (m[^\s*'$SCRATCH_DEV']) { # devfs (long) names
|
||||
$next = 1;
|
||||
}' | LC_COLLATE=POSIX sort >$tmp.quota
|
||||
|
||||
|
||||
+1
-1
@@ -150,7 +150,7 @@ _filter_mkfs()
|
||||
{
|
||||
set -
|
||||
perl -ne '
|
||||
if (/^meta-data=([\w|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) {
|
||||
if (/^meta-data=([\w,|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) {
|
||||
print STDERR "ddev=$1\nisize=$2\nagcount=$3\nagsize=$4\n";
|
||||
print STDOUT "meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks\n";
|
||||
}
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ _filter_repquota()
|
||||
{
|
||||
head -$1 | perl -ne "
|
||||
s/^(\w+)\s+([-|+])/[NAME] \2/g;
|
||||
s,$SCRATCH_DEV,[DEVICE],g;
|
||||
s($SCRATCH_DEV)([DEVICE])g;
|
||||
print"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user