[ARVADOS] updated: dd1db553b2cba95c6af2e22e2bf947d6aec74fe1

[Git user]

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

       via  dd1db553b2cba95c6af2e22e2bf947d6aec74fe1 (commit)
      from  0ed39efc7ccbb6d03cf9f406a3a0a060bcc50d3c (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 dd1db553b2cba95c6af2e22e2bf947d6aec74fe1
Author: radhika <radhika at curoverse.com>
Date:   Wed Mar 15 00:10:27 2017 -0400

    11251: -v works with -e in TESTOPTS

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 811d84d..1bb4e1d 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -104,10 +104,8 @@ tools/keep-exercise
 tools/keep-rsync
 tools/keep-block-check
 
-(*) apps/workbench is shorthand for
-    apps/workbench_units +
-    apps/workbench_functionals +
-    apps/workbench_integration_all_but_ps + apps/workbench_integration_only_ps
+(*) apps/workbench is shorthand for apps/workbench_units +
+    apps/workbench_functionals + apps/workbench_integration
 
 EOF
 
@@ -523,7 +521,7 @@ retry() {
 
 do_test() {
     case "${1}" in
-        apps/workbench_units | apps/workbench_functionals | apps/workbench_integration_all_but_ps | apps/workbench_integration_only_ps)
+        apps/workbench_units | apps/workbench_functionals | apps/workbench_integration)
             suite=apps/workbench
             ;;
         *)
@@ -892,7 +890,7 @@ do_test apps/workbench_integration workbench_integration
 test_workbench_integration_all_but_ps() {
     start_nginx_proxy_services \
         && cd "$WORKSPACE/apps/workbench" \
-        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:integration TESTOPTS=-e/^\(test_pipeline\|test_project\)\.*$/
+        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:integration TESTOPTS=-ve/^\(test_pipeline\|test_project\)\.*$/
 }
 do_test apps/workbench_integration_all_but_ps workbench_integration_all_but_ps
 

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


hooks/post-receive
--