mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
make sure the test shows any garbage output.
Merge of master-melb:xfs-cmds:29378a by kenmcd. Add the modified filter that was removed from common.dmapi
This commit is contained in:
@@ -25,6 +25,29 @@ _cleanup()
|
||||
_cleanup_testdir
|
||||
}
|
||||
|
||||
_filter_dmapi_print_event() {
|
||||
$PERL_PROG -ne '
|
||||
# replace session/file specific output with generic placeholders
|
||||
s/token\s+\d+/token TOKEN/g ;
|
||||
s/sequence\s+\d+/sequence SEQ/g ;
|
||||
s/^\s+parent\s+dir\s+\w+/parent dir PARENT_DIR/g ;
|
||||
s/^\s+name\s+.*/name FILE_NAME/g ;
|
||||
s/^\s+mode\s+bits\s+mode\s+\d+:\s+/mode bits mode MODE: /g ;
|
||||
s/perm\s+[\w|-]+\s[\w|-]+\s[\w|-]+/perm PERMISSIONS/g ;
|
||||
s/,\s+type\s+.*/, type FILE_TYPE/g ;
|
||||
s/^\s+object\s+\w+/object OBJECT/g ;
|
||||
s/^\s+new\s+object\s+\w+/new object OBJECT/g ;
|
||||
s/^\s+handle\s+\w+/handle HANDLE/g ;
|
||||
|
||||
# when print_event is killed, the following is output. trim it
|
||||
s/^\s*print_event: Processing any undelivered event messages.*\n//g ;
|
||||
s/^\s*print_event: Shutting down the session.*\n//g ;
|
||||
|
||||
# trim blank lines
|
||||
s/^\s*\n//g ;
|
||||
print ;'
|
||||
}
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
|
||||
@@ -5,16 +5,16 @@ QA output created by 168
|
||||
# set dmapi attributes on file
|
||||
# remove file
|
||||
# here comes the dmapi print_event filtered and sorted output
|
||||
attrcopy 415454525f56414c55455f3100
|
||||
attrcopy <NONE>
|
||||
attrname <NONE>
|
||||
attrname ATTR_NAM
|
||||
retcode 0
|
||||
retcode 0
|
||||
retcode 0
|
||||
retcode 0
|
||||
attrcopy COPY
|
||||
attribute: token TOKEN sequence SEQ
|
||||
attribute: token TOKEN sequence SEQ
|
||||
attrname NAME
|
||||
create: token TOKEN sequence SEQ
|
||||
create: token TOKEN sequence SEQ
|
||||
destroy: token TOKEN sequence SEQ
|
||||
|
||||
@@ -29,28 +29,4 @@ _dmapi_scratch_mount () {
|
||||
fi
|
||||
}
|
||||
|
||||
_filter_dmapi_print_event() {
|
||||
$PERL_PROG -ne '
|
||||
# replace session/file specific output with generic placeholders
|
||||
s/token\s+\d+/token TOKEN/g ;
|
||||
s/sequence\s+\d+/sequence SEQ/g ;
|
||||
s/^\s+parent\s+dir\s+\w+/parent dir PARENT_DIR/g ;
|
||||
s/^\s+name\s+.*/name FILE_NAME/g ;
|
||||
s/^\s+mode\s+bits\s+mode\s+\d+:\s+/mode bits mode MODE: /g ;
|
||||
s/perm\s+[\w|-]+\s[\w|-]+\s[\w|-]+/perm PERMISSIONS/g ;
|
||||
s/,\s+type\s+.*/, type FILE_TYPE/g ;
|
||||
s/^\s+object\s+\w+/object OBJECT/g ;
|
||||
s/^\s+new\s+object\s+\w+/new object OBJECT/g ;
|
||||
s/^\s+handle\s+\w+/handle HANDLE/g ;
|
||||
s/^\s+attrcopy\s+\w+/attrcopy COPY/g ;
|
||||
s/^\s+attrname\s+\w+/attrname NAME/g ;
|
||||
|
||||
# when print_event is killed, the following is output. trim it
|
||||
s/^\s*print_event: Processing any undelivered event messages.*\n//g ;
|
||||
s/^\s*print_event: Shutting down the session.*\n//g ;
|
||||
|
||||
# trim blank lines
|
||||
s/^\s*\n//g ;
|
||||
print ;'
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user