Skip to content

Commit

Permalink
Require selecting a test mode in run_tests.sh
Browse files Browse the repository at this point in the history
We have recently removed from this script the possibility to test
installed tools, which was the default when no test mode was
selected.

xref. #15326
  • Loading branch information
nsoranzo committed Jan 18, 2023
1 parent a01d0a4 commit 6c3741d
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ do
;;
-id|--id)
if [ $# -gt 1 ]; then
test_id=$2;
test_id=$2
shift 2
else
echo "--id requires an argument" 1>&2
echo "ERROR: --id requires an argument" 1>&2
exit 1
fi
;;
Expand Down Expand Up @@ -388,28 +388,28 @@ do
GALAXY_TEST_TOOL_CONF="test/functional/tools/sample_tool_conf.xml"
marker="tool"
report_file="run_framework_tests.html"
framework_test=1;
framework_test=1
shift 1
;;
-d|-data_managers|--data_managers)
marker="data_manager"
report_file="run_data_managers_tests.html"
data_managers_test=1;
data_managers_test=1
shift 1
;;
-main|-main_tools|--main_tools)
GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample"
marker="tool"
report_file="run_framework_tests.html"
framework_test=1;
framework_test=1
shift 1
;;
-r|--report_file)
if [ $# -gt 1 ]; then
report_file=$2
shift 2
else
echo "--report_file requires an argument" 1>&2
echo "ERROR: --report_file requires an argument" 1>&2
exit 1
fi
;;
Expand All @@ -418,7 +418,7 @@ do
xunit_report_file=$2
shift 2
else
echo "--xunit_report_file requires an argument" 1>&2
echo "ERROR: --xunit_report_file requires an argument" 1>&2
exit 1
fi
;;
Expand All @@ -427,7 +427,7 @@ do
structured_data_report_file=$2
shift 2
else
echo "--structured_data_report_file requires an argument" 1>&2
echo "ERROR: --structured_data_report_file requires an argument" 1>&2
exit 1
fi
;;
Expand Down Expand Up @@ -523,7 +523,7 @@ do
break
;;
-*)
echo "invalid option: $1" 1>&2;
echo "ERROR: Invalid option $1" 1>&2
show_help
exit 1
;;
Expand Down Expand Up @@ -572,7 +572,9 @@ elif [ -n "$integration_extra" ]; then
elif [ -n "$test_target" ] ; then
extra_args="$test_target"
else
extra_args=""
echo "ERROR: No testing mode selected!" 1>&2
show_help
exit 1
fi

if [ -n "$xunit_report_file" ]; then
Expand Down

0 comments on commit 6c3741d

Please sign in to comment.