File tree Expand file tree Collapse file tree 1 file changed +6
-15
lines changed Expand file tree Collapse file tree 1 file changed +6
-15
lines changed Original file line number Diff line number Diff line change @@ -446,11 +446,7 @@ if [ -n "$SINGLETEST" ]; then
446
446
fi
447
447
RUNFILE_DIR=" /var/tmp"
448
448
RUNFILES=" zfs-tests.$$ .run"
449
- SINGLEQUIET=" False"
450
-
451
- if [ -n " $QUIET " ]; then
452
- SINGLEQUIET=" True"
453
- fi
449
+ [ -n " $QUIET " ] && SINGLEQUIET=" True" || SINGLEQUIET=" False"
454
450
455
451
cat > " ${RUNFILE_DIR} /${RUNFILES} " << EOF
456
452
[DEFAULT]
@@ -464,18 +460,13 @@ post =
464
460
outputdir = /var/tmp/test_results
465
461
EOF
466
462
SINGLETESTDIR=" ${SINGLETEST%/* } "
467
- SINGLETESTFILE=" ${SINGLETEST##*/ } "
468
- SETUPSCRIPT=
469
- CLEANUPSCRIPT=
470
463
471
- if [ -f " $STF_SUITE /$SINGLETESTDIR /setup.ksh" ]; then
472
- SETUPSCRIPT=" setup"
473
- fi
474
-
475
- if [ -f " $STF_SUITE /$SINGLETESTDIR /cleanup.ksh" ]; then
476
- CLEANUPSCRIPT=" cleanup"
477
- fi
464
+ SETUPDIR=" $SINGLETESTDIR "
465
+ [ " ${SETUPDIR#/ } " = " $SETUPDIR " ] && SETUPDIR=" $STF_SUITE /$SINGLETESTDIR "
466
+ [ -x " $SETUPDIR /setup.ksh" ] && SETUPSCRIPT=" setup" || SETUPSCRIPT=
467
+ [ -x " $SETUPDIR /cleanup.ksh" ] && CLEANUPSCRIPT=" cleanup" || CLEANUPSCRIPT=
478
468
469
+ SINGLETESTFILE=" ${SINGLETEST##*/ } "
479
470
cat >> " ${RUNFILE_DIR} /${RUNFILES} " << EOF
480
471
481
472
[$SINGLETESTDIR ]
You can’t perform that action at this time.
0 commit comments