summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@fingolfin.org>2020-03-21 13:02:45 +0000
committerRobert Mustacchi <rm@fingolfin.org>2020-03-25 16:53:37 +0000
commite5c541a6c70df2548bbaa19fa43a7dbebe4b637a (patch)
treedfe8e07a22a26c26b91830469fd5b1483f699dd9
parent7adb68a6af9135eabca6203d488597cb40c4675c (diff)
downloadillumos-joyent-e5c541a6c70df2548bbaa19fa43a7dbebe4b637a.tar.gz
12425 /opt/util-tests/bin/utiltest needs default run file handling
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Alexander Pyhalov <alp@rsu.ru> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/test/util-tests/cmd/utiltest.ksh6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/test/util-tests/cmd/utiltest.ksh b/usr/src/test/util-tests/cmd/utiltest.ksh
index e701aeb854..01f365cde9 100644
--- a/usr/src/test/util-tests/cmd/utiltest.ksh
+++ b/usr/src/test/util-tests/cmd/utiltest.ksh
@@ -37,8 +37,10 @@ function find_runfile
distro=openindiana
elif [[ 0 -ne $(grep -c OmniOS /etc/release 2>/dev/null) ]]; then
distro=omnios
- elif [[ -f $MY_TESTS/runfiles/default.run ]]; then
- # optional catch-all
+ fi
+
+ if [[ ! -f $MY_TESTS/runfiles/$distro.run ]] && \
+ [[ -f $MY_TESTS/runfiles/default.run ]]; then
distro=default
fi