From 7da5b17cac75ad7d60454e4ef5bac6d36550bf86 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 2 Dec 2016 10:35:31 -0500 Subject: [PATCH 1/2] Add a useful logging statement in run_tests.sh. --- run_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run_tests.sh b/run_tests.sh index a595d1ef8ab..5b652a96c25 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -247,6 +247,7 @@ then DOCKER_RUN_EXTRA_ARGS="-v ${tmp}:/tmp ${DOCKER_RUN_EXTRA_ARGS}" shift fi + echo "Launching docker container for testing..." docker $DOCKER_EXTRA_ARGS run $DOCKER_RUN_EXTRA_ARGS -e "GALAXY_TEST_DATABASE_TYPE=$db_type" --rm -v `pwd`:/galaxy $DOCKER_IMAGE "$@" exit $? fi From 0ee095024005862aa2aed585569af1086bbb557e Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 2 Dec 2016 09:16:39 -0500 Subject: [PATCH 2/2] Fix for new run_tests.sh option to clean PYC files. --- run_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run_tests.sh b/run_tests.sh index 5b652a96c25..ac4babd922e 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -328,6 +328,7 @@ do -clean_pyc|--clean_pyc) find lib -iname '*pyc' -exec rm -rf {} \; find test -iname '*pyc' -exec rm -rf {} \; + shift ;; -with_framework_test_tools|--with_framework_test_tools) with_framework_test_tools_arg="-with_framework_test_tools"