diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2018-12-07 00:27:38 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2018-12-07 00:27:38 +0000 |
| commit | a9ebbf33ea849dab97f039bdec0fa0f7edefbac5 (patch) | |
| tree | 343dbcf28681f59d2792f4e6f4a33f5304e69bcf /tests | |
| parent | bc1ee0be2d5fbecd4ba5cc9f31b7f65fe20bfc96 (diff) | |
Notes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/geom/class/eli/conf.sh | 1 | ||||
| -rw-r--r-- | tests/sys/geom/class/geom_subr.sh | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/tests/sys/geom/class/eli/conf.sh b/tests/sys/geom/class/eli/conf.sh index 08d25ab933b2d..1a37f806d74ae 100644 --- a/tests/sys/geom/class/eli/conf.sh +++ b/tests/sys/geom/class/eli/conf.sh @@ -4,7 +4,6 @@ class="eli" base=$(atf_get ident) MAX_SECSIZE=8192 -TEST_MDS_FILE=md.devs attach_md() { diff --git a/tests/sys/geom/class/geom_subr.sh b/tests/sys/geom/class/geom_subr.sh index 0ac329083fbd0..71ed4a15540fb 100644 --- a/tests/sys/geom/class/geom_subr.sh +++ b/tests/sys/geom/class/geom_subr.sh @@ -1,8 +1,7 @@ #!/bin/sh # $FreeBSD$ -# NOTE: existence is sanity-checked in `geom_verify_temp_mds_file_existence(..)` -TEST_MDS_FILE="$(mktemp test_mds.${0##*/}.XXXXXXXX)" +TEST_MDS_FILE="${TMPDIR}/test_mds.$(basename $0)" devwait() { @@ -47,14 +46,6 @@ geom_test_cleanup() fi } -geom_verify_temp_mds_file_existence() -{ - if [ ! -f $TEST_MDS_FILE ]; then - echo "test md(4) devices file creation unsuccessful" - return 1 - fi -} - geom_load_class_if_needed() { local class=$1 @@ -71,9 +62,6 @@ geom_load_class_if_needed() geom_atf_test_setup() { - if ! error_message=$(geom_verify_temp_mds_file_existence); then - atf_skip "$error_message" - fi if ! error_message=$(geom_load_class_if_needed $class); then atf_skip "$error_message" fi @@ -81,10 +69,6 @@ geom_atf_test_setup() geom_tap_test_setup() { - if ! error_message=$(geom_verify_temp_mds_file_existence); then - echo "1..0 # SKIP $error_message" - exit 1 - fi if ! error_message=$(geom_load_class_if_needed $class); then echo "1..0 # SKIP $error_message" exit 0 |