Skip to content

Commit

Permalink
Move TESTSUITE => PHPUNIT_TESTSUITE
Browse files Browse the repository at this point in the history
  • Loading branch information
stronk7 committed Jan 23, 2024
1 parent 61b5da7 commit f7211d0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ phpunit_options=""
if [[ -n ${phpunit_filter} ]]; then
phpunit_options="--filter ${phpunit_filter}"
fi
if [[ -n ${phpunit_suite} ]]; then
phpunit_options+=" --testsuite ${phpunit_suite}"
if [[ -n ${phpunit_testsuite} ]]; then
phpunit_options+=" --testsuite ${phpunit_testsuite}"
fi
phpunit_options="${phpunit_options:-complete}"

Expand All @@ -53,7 +53,7 @@ if [[ "${jobtype}" == "all" ]] || [[ "${jobtype}" == "phpunit" ]]; then
-p DATABASE=sqlsrv \
-p PHPVERSION=${php_version} \
-p TAGS=${phpunit_filter} \
-p TESTSUITE=${phpunit_suite} \
-p PHPUNIT_TESTSUITE=${phpunit_testsuite} \
-p RUNNERVERSION=${runner} \
-w >> "${resultfile}.jenkinscli" < /dev/null
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ if [[ $jobtype =~ ^phpunit ]]; then # Only if the job type is phpunit.
if [[ -n ${phpunit_filter} ]]; then
phpunit_options="--filter ${phpunit_filter}"
fi
if [[ -n ${phpunit_suite} ]]; then
phpunit_options+=" --testsuite ${phpunit_suite}"
if [[ -n ${phpunit_testsuite} ]]; then
phpunit_options+=" --testsuite ${phpunit_testsuite}"
fi
phpunit_options="${phpunit_options:-complete}"
echo "PHPUnit options: ${phpunit_options}"
Expand Down Expand Up @@ -90,7 +90,7 @@ if [[ "${jobtype}" == "phpunit" ]]; then
-p DATABASE=${dbtype} \
-p PHPVERSION=${php_version} \
-p TAGS=${phpunit_filter} \
-p TESTSUITE=${phpunit_suite} \
-p PHPUNIT_TESTSUITE=${phpunit_testsuite} \
-p RUNNERVERSION=${runner} \
-w >> "${resultfile}.jenkinscli" < /dev/null
done
Expand Down

0 comments on commit f7211d0

Please sign in to comment.