This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 88f9a2b9bf6db8cab45446eeae0ba4c8ba6fe7e3 (commit)
via d581dc189d46681a2e0f4f7a158211c78a1aa80a (commit)
via 86750b92dc8e1affe8fe8b1bef1ef24fec242344 (commit)
via 057de592118cfcfc6dea62af89efc011767476a0 (commit)
via 4a680ce03f72afe3efe133674b8fc181def4afc0 (commit)
via 8b71f14ea202ca964227148a5db8cc4f1c310401 (commit)
via a483287fc6e571c2673aec9d75846c20febcbad2 (commit)
via 6f0c5fe3ccc5e580c044ea194419558ec469a952 (commit)
from 0e25b3c0bb2ba07e84e9a9ea1c2ac633fa554ccd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=88f9a2b9bf6db8cab45446eeae0ba4c8ba6fe7e3
commit 88f9a2b9bf6db8cab45446eeae0ba4c8ba6fe7e3
Merge: 86750b9 d581dc1
Author: Franck Villaume <[email protected]>
Date: Sun May 12 18:55:39 2019 +0200
Merge branch '6.1'
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=86750b92dc8e1affe8fe8b1bef1ef24fec242344
commit 86750b92dc8e1affe8fe8b1bef1ef24fec242344
Merge: 0e25b3c 057de59
Author: Franck Villaume <[email protected]>
Date: Sun May 12 18:54:37 2019 +0200
Merge 6.1
diff --cc tests/buildbot/fusionforge-unit_tests.sh
index 90af1a5,56393f2..25acd0c
--- a/tests/buildbot/fusionforge-unit_tests.sh
+++ b/tests/buildbot/fusionforge-unit_tests.sh
@@@ -11,9 -11,9 +11,4 @@@ prepare_workspac
cd tests/
phpunit --configuration buildbot-configuration-phpunit.xml \
--log-junit $WORKSPACE/reports/phpunit.xml \
- --coverage-clover $WORKSPACE/reports/coverage/clover.xml \
- --coverage-html $WORKSPACE/reports/coverage/ \
code_and_unit_tests.php
- # --coverage-clover $WORKSPACE/reports/coverage/clover.xml \
- # --coverage-html $WORKSPACE/reports/coverage/ \
- #cp $WORKSPACE/reports/phpunit.xml $WORKSPACE/reports/phpunit.xml.org
-#cp $WORKSPACE/reports/phpunit.xml $WORKSPACE/reports/phpunit.xml.org
--#xalan -in $WORKSPACE/reports/phpunit.xml.org -xsl unit/fix_phpunit.xslt \
--# -out $WORKSPACE/reports/phpunit.xml
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/fusionforge-unit_tests.sh | 5 -----
1 file changed, 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits