Skip to content

stop clobbering config in the generic phpunit config #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2018
Merged

stop clobbering config in the generic phpunit config #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions includes/generic/setConfig.inc.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,15 @@ phpUnitCoverage=${phpUnitCoverage:-0}
# How many minutes after a failed PHPUnit run you can retry failed only
phpunitRerunTimeoutMins=${phpunitRerunTimeoutMins:-5}

if [[ -f $projectRoot/phpunit.xml ]]
if [[ "1" == "$phpUnitCoverage" ]]
then
# Project root phpunit.xml trumps everything else
phpUnitConfigPath=$projectRoot/phpunit.xml
phpUnitConfigPath=$(configPath phpunit-with-coverage.xml)
else
if [[ "1" == "$phpUnitCoverage" ]]
then
phpUnitConfigPath=$(configPath phpunit-with-coverage.xml)
else
phpUnitConfigPath=$(configPath phpunit.xml)
fi
phpUnitConfigPath=$(configPath phpunit.xml)
fi


# If a CI variable is set, we use that, otherwise default to false.
# Travis-CI sets a CI variable. You can easily set this in any other CI system
# The value should the the string 'true' if this is CI
CI=${CI:-'false'}
CI=${CI:-'false'}