Author: ngie Date: Wed Apr 6 06:37:36 2016 New Revision: 297612 URL: https://svnweb.freebsd.org/changeset/base/297612
Log: MFC r297183: Use a SKIP testplan instead of bailing out if/when the tester isn't root, or the geom class can't be loaded cleanly [*] This makes sure that scenarios that are easy to hit aren't counted as false positives with kyua test PR: 208101 Modified: stable/10/tests/sys/geom/class/geom_subr.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/tests/sys/geom/class/geom_subr.sh ============================================================================== --- stable/10/tests/sys/geom/class/geom_subr.sh Wed Apr 6 05:13:36 2016 (r297611) +++ stable/10/tests/sys/geom/class/geom_subr.sh Wed Apr 6 06:37:36 2016 (r297612) @@ -35,16 +35,14 @@ geom_test_cleanup() } if [ $(id -u) -ne 0 ]; then - echo 'Tests must be run as root' - echo 'Bail out!' - exit 1 + echo '1..0 # SKIP tests must be run as root' + exit 0 fi # If the geom class isn't already loaded, try loading it. if ! kldstat -q -m g_${class}; then if ! geom ${class} load; then - echo "Could not load module for geom class=${class}" - echo 'Bail out!' - exit 1 + echo "1..0 # SKIP could not load module for geom class=${class}" + exit 0 fi fi _______________________________________________ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"