[ARVADOS] updated: 1.3.0-603-g5950f9090

Git user git at public.curoverse.com
Wed Mar 27 15:15:42 UTC 2019


Summary of changes:
 build/run-tests.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

       via  5950f9090f499c770908622bd300d98f9f1da1fc (commit)
      from  efe2b4796783672eb3385b45dfcd4b83055cbfa3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5950f9090f499c770908622bd300d98f9f1da1fc
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Mar 27 11:15:15 2019 -0400

    Accept :py3 modifier for any Python suite in interactive mode.
    
    (even ones that aren't normally run with python3 by jenkins)
    
    refs #14939
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index f2c7a3e86..ec5d48e2b 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1171,11 +1171,8 @@ for g in "${gostuff[@]}"; do
 done
 for p in "${pythonstuff[@]}"; do
     dir=${p%:py3}
-    if [[ ${dir} = ${p} ]]; then
-        testfuncargs[$p]="$dir pip $VENVDIR/bin/"
-    else
-        testfuncargs[$p]="$dir pip $VENV3DIR/bin/"
-    fi
+    testfuncargs[$dir]="$dir pip $VENVDIR/bin/"
+    testfuncargs[$dir:py3]="$dir pip $VENV3DIR/bin/"
 done
 
 if [[ -z ${interactive} ]]; then
@@ -1201,6 +1198,12 @@ else
     setnextcmd
     while read -p 'What next? ' -e -i "${nextcmd}" nextcmd; do
         read verb target opts <<<"${nextcmd}"
+        target="${target%/}"
+        target="${target/\/:/:}"
+        if [[ -z "${target}" ]]; then
+            help_interactive
+            continue
+        fi
         case "${verb}" in
             "" | "help")
                 help_interactive
@@ -1212,7 +1215,6 @@ else
                 stop_services
                 ;;
             *)
-                target="${target%/}"
                 testargs["$target"]="${opts}"
                 case "$target" in
                     all | deps)

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list