PROG=zfs-tests.sh
VERBOSE="no"
QUIET=""
+DEBUG=""
CLEANUP="yes"
CLEANUPALL="no"
KMSG=""
-h Show this message
-v Verbose zfs-tests.sh output
-q Quiet test-runner output
+ -D Debug; show all test output immediately (noisy)
-x Remove all testpools, dm, lo, and files (unsafe)
-k Disable cleanup after test failure
-K Log test names to /dev/kmsg
EOF
}
-while getopts 'hvqxkKfScRmn:d:s:r:?t:T:u:I:' OPTION; do
+while getopts 'hvqxkKfScRmn:d:Ds:r:?t:T:u:I:' OPTION; do
case $OPTION in
h)
usage
d)
FILEDIR="$OPTARG"
;;
+ D)
+ DEBUG="yes"
+ ;;
I)
ITERATIONS="$OPTARG"
if [ "$ITERATIONS" -le 0 ]; then
#
msg "${TEST_RUNNER}" \
"${QUIET:+-q}" \
+ "${DEBUG:+-D}" \
"${KMEMLEAK:+-m}" \
"${KMSG:+-K}" \
"-c \"${RUNFILES}\"" \
{ PATH=$STF_PATH \
${TEST_RUNNER} \
${QUIET:+-q} \
+ ${DEBUG:+-D} \
${KMEMLEAK:+-m} \
${KMSG:+-K} \
-c "${RUNFILES}" \
{ PATH=$STF_PATH \
${TEST_RUNNER} \
${QUIET:+-q} \
+ ${DEBUG:+-D} \
${KMEMLEAK:+-m} \
-c "${RUNFILES}" \
-T "${TAGS}" \
This class is a slightly modified version of the 'Stream' class found
here: http://goo.gl/aSGfv
"""
- def __init__(self, stream):
+ def __init__(self, stream, debug=False):
self.stream = stream
+ self.debug = debug
self._buf = b''
self.lines = []
buf = os.read(fd, 4096)
if not buf:
return None
+ if self.debug:
+ os.write(sys.stderr.fileno(), buf)
if b'\n' not in buf:
self._buf += buf
return []
ret = '%s -E -u %s %s' % (SUDO, user, cmd)
return ret.split(' ')
- def collect_output(self, proc):
+ def collect_output(self, proc, debug=False):
"""
Read from stdout/stderr as data becomes available, until the
process is no longer running. Return the lines from the stdout and
stderr Output objects.
"""
- out = Output(proc.stdout)
- err = Output(proc.stderr)
+ out = Output(proc.stdout, debug)
+ err = Output(proc.stderr, debug)
res = []
while proc.returncode is None:
proc.poll()
try:
t.start()
- self.result.stdout, self.result.stderr = self.collect_output(proc)
+
+ out, err = self.collect_output(proc, options.debug)
+ self.result.stdout = out
+ self.result.stderr = err
if kmemleak:
cmd = f'{SUDO} sh -c "echo scan > {KMEMLEAK_FILE}"'
class TestRun(object):
- props = ['quiet', 'outputdir']
+ props = ['quiet', 'outputdir', 'debug']
def __init__(self, options):
self.tests = {}
('post_user', ''),
('failsafe', ''),
('failsafe_user', ''),
- ('tags', [])
+ ('tags', []),
+ ('debug', False)
]
def __str__(self):
help='Specify tests to run via config files.')
parser.add_option('-d', action='store_true', default=False, dest='dryrun',
help='Dry run. Print tests, but take no other action.')
+ parser.add_option('-D', action='store_true', default=False, dest='debug',
+ help='Write all test output to stdout as it arrives.')
parser.add_option('-l', action='callback', callback=options_cb,
default=None, dest='logfile', metavar='logfile',
type='string',