Skip to content
GitLab
Commit 00690ab4 authored by Carsten Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into 'develop' 

Master

See merge request !306
parents ba650580 0a83cde2
Pipeline #4936 passed with stages
in 3 minutes and 48 seconds
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ 00690ab4
...@@ -121,6 +121,7 @@ phpunit: ...@@ -121,6 +121,7 @@ phpunit:
mv -v extension/* typo3conf/ext/qfq/ mv -v extension/* typo3conf/ext/qfq/
# create new kind of config (qfq.json) # create new kind of config (qfq.json)
mkdir -p ../conf
cp -v typo3conf/ext/qfq/Tests/phpunit_qfq.json ../conf/qfq.json; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" ../conf/qfq.json cp -v typo3conf/ext/qfq/Tests/phpunit_qfq.json ../conf/qfq.json; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" ../conf/qfq.json
cp -v typo3conf/ext/qfq/Tests/phpunit_LocalConfiguration.php typo3conf/LocalConfiguration.php cp -v typo3conf/ext/qfq/Tests/phpunit_LocalConfiguration.php typo3conf/LocalConfiguration.php
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment