X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8fc563f15301baa0a59bfae748e0c8cd2d5eefda..dcb7f718a7bf31c6e1227d28cdaac64fa769015b:/build/run-tests.sh?ds=sidebyside

diff --git a/build/run-tests.sh b/build/run-tests.sh
index b129d0978a..4b6c81395f 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -121,7 +121,7 @@ GEMHOME=
 PERLINSTALLBASE=
 
 short=
-skip_install=
+only_install=
 temp=
 temp_preserve=
 
@@ -221,7 +221,7 @@ do
             exit 1
             ;;
         --skip)
-            skip[$1]=1
+            skip[$1]=1; shift
             ;;
         --only)
             only="$1"; skip[$1]=""; shift
@@ -230,10 +230,9 @@ do
             short=1
             ;;
         --skip-install)
-            skip_install=1
+            only_install=nothing
             ;;
         --only-install)
-            skip_install=1
             only_install="$1"; shift
             ;;
         --temp)
@@ -527,7 +526,8 @@ do_test() {
             ;;
     esac
     if [[ -z "${skip[$suite]}" && -z "${skip[$1]}" && \
-                (-z "${only}" || "${only}" == "${suite}") ]]; then
+                (-z "${only}" || "${only}" == "${suite}" || \
+                 "${only}" == "${1}") ]]; then
         retry do_test_once ${@}
     else
         title "Skipping ${1} tests"
@@ -597,8 +597,7 @@ do_test_once() {
 }
 
 do_install() {
-    if [[ -z "${skip_install}" && \
-                (-z "${only_install}" || "${only_install}" == "${1}") ]]; then
+    if [[ -z "${only_install}" || "${only_install}" == "${1}" ]]; then
         retry do_install_once ${@}
     else
         title "Skipping $1 install"