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, 6.1 has been updated
via 057de592118cfcfc6dea62af89efc011767476a0 (commit)
via 4a680ce03f72afe3efe133674b8fc181def4afc0 (commit)
via 8b71f14ea202ca964227148a5db8cc4f1c310401 (commit)
via a483287fc6e571c2673aec9d75846c20febcbad2 (commit)
via 6f0c5fe3ccc5e580c044ea194419558ec469a952 (commit)
from 9d5b97d50c30df3a16e7a206211b4674a5c1ef6b (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=057de592118cfcfc6dea62af89efc011767476a0
commit 057de592118cfcfc6dea62af89efc011767476a0
Author: Franck Villaume <[email protected]>
Date: Wed Feb 27 19:31:53 2019 +0100
try #3 to fix phpunit usage since the platform upgrade
diff --git a/tests/buildbot/fusionforge-unit_tests.sh
b/tests/buildbot/fusionforge-unit_tests.sh
index 6dab98d..56393f2 100755
--- a/tests/buildbot/fusionforge-unit_tests.sh
+++ b/tests/buildbot/fusionforge-unit_tests.sh
@@ -14,6 +14,6 @@ phpunit --configuration buildbot-configuration-phpunit.xml \
--coverage-clover $WORKSPACE/reports/coverage/clover.xml \
--coverage-html $WORKSPACE/reports/coverage/ \
code_and_unit_tests.php
-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
+#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
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4a680ce03f72afe3efe133674b8fc181def4afc0
commit 4a680ce03f72afe3efe133674b8fc181def4afc0
Author: Franck Villaume <[email protected]>
Date: Sun Mar 3 18:53:16 2019 +0100
try #5 to fix phpunit usage since the platform upgrade
diff --git a/tests/buildbot-configuration-phpunit.xml
b/tests/buildbot-configuration-phpunit.xml
index 1567cf8..7f7eed7 100644
--- a/tests/buildbot-configuration-phpunit.xml
+++ b/tests/buildbot-configuration-phpunit.xml
@@ -1,4 +1,6 @@
-<phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.4/phpunit.xsd";
+ verbose="true">
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">../src</directory>
@@ -7,12 +9,4 @@
<php>
<includePath>../src</includePath>
</php>
- <testsuites>
- <testsuite name="Unit Tests">
- <directory>../tests/unit</directory>
- </testsuite>
- <testsuite name="Code Tests">
- <directory>../tests/code</directory>
- </testsuite>
- </testsuites>
</phpunit>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8b71f14ea202ca964227148a5db8cc4f1c310401
commit 8b71f14ea202ca964227148a5db8cc4f1c310401
Author: Franck Villaume <[email protected]>
Date: Wed Feb 27 19:42:03 2019 +0100
try #4 to fix phpunit usage since the platform upgrade
diff --git a/tests/buildbot-configuration-phpunit.xml
b/tests/buildbot-configuration-phpunit.xml
index f4edc28..1567cf8 100644
--- a/tests/buildbot-configuration-phpunit.xml
+++ b/tests/buildbot-configuration-phpunit.xml
@@ -7,4 +7,12 @@
<php>
<includePath>../src</includePath>
</php>
+ <testsuites>
+ <testsuite name="Unit Tests">
+ <directory>../tests/unit</directory>
+ </testsuite>
+ <testsuite name="Code Tests">
+ <directory>../tests/code</directory>
+ </testsuite>
+ </testsuites>
</phpunit>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a483287fc6e571c2673aec9d75846c20febcbad2
commit a483287fc6e571c2673aec9d75846c20febcbad2
Author: Franck Villaume <[email protected]>
Date: Wed Feb 27 19:12:48 2019 +0100
try #2 to fix phpunit usage since the platform upgrade
diff --git a/tests/buildbot-configuration-phpunit.xml
b/tests/buildbot-configuration-phpunit.xml
index 958e2cb..f4edc28 100644
--- a/tests/buildbot-configuration-phpunit.xml
+++ b/tests/buildbot-configuration-phpunit.xml
@@ -1,7 +1,10 @@
<phpunit>
-<filter>
- <whitelist processUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">../src</directory>
- </whitelist>
-</filter>
+ <filter>
+ <whitelist processUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">../src</directory>
+ </whitelist>
+ </filter>
+ <php>
+ <includePath>../src</includePath>
+ </php>
</phpunit>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6f0c5fe3ccc5e580c044ea194419558ec469a952
commit 6f0c5fe3ccc5e580c044ea194419558ec469a952
Author: Franck Villaume <[email protected]>
Date: Wed Feb 27 18:44:48 2019 +0100
try #1 to fix phpunit usage since the platform upgrade
diff --git a/tests/buildbot-configuration-phpunit.xml
b/tests/buildbot-configuration-phpunit.xml
new file mode 100644
index 0000000..958e2cb
--- /dev/null
+++ b/tests/buildbot-configuration-phpunit.xml
@@ -0,0 +1,7 @@
+<phpunit>
+<filter>
+ <whitelist processUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">../src</directory>
+ </whitelist>
+</filter>
+</phpunit>
diff --git a/tests/buildbot/fusionforge-unit_tests.sh
b/tests/buildbot/fusionforge-unit_tests.sh
index 0085487..6dab98d 100755
--- a/tests/buildbot/fusionforge-unit_tests.sh
+++ b/tests/buildbot/fusionforge-unit_tests.sh
@@ -9,7 +9,8 @@ prepare_workspace
# apt-get install pcregrep moreutils xalan
cd tests/
-phpunit --log-junit $WORKSPACE/reports/phpunit.xml \
+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
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot-configuration-phpunit.xml | 12 ++++++++++++
tests/buildbot/fusionforge-unit_tests.sh | 9 +++++----
2 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 tests/buildbot-configuration-phpunit.xml
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
