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 37e80a43062ad0f47242a88e089fd40aa30d89c6 (commit)
from 2a8b3abcc86607843a2e7bc178e9fecfb5f4a7f7 (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=37e80a43062ad0f47242a88e089fd40aa30d89c6
commit 37e80a43062ad0f47242a88e089fd40aa30d89c6
Author: Roland Mas <[email protected]>
Date: Tue Nov 10 17:49:34 2020 +0100
Try fixing testsuite on Debian 10
diff --git a/tests/code_and_unit_tests.php b/tests/code_and_unit_tests.php
index 6385b88..c9c56d6 100644
--- a/tests/code_and_unit_tests.php
+++ b/tests/code_and_unit_tests.php
@@ -22,9 +22,16 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'AllTests::main');
}
-if (!@include_once 'PHPUnit/Autoload.php') {
- include_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
+if (@include_once '/usr/local/share/php/vendor/autoload.php') {
+ $phpunitversion = 6;
+ class PHPUnit_Framework_TestSuite extends PHPUnit\Framework\TestSuite {}
+ class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase {}
+} else {
+ $phpunitversion = 4;
+ if (!@include_once 'PHPUnit/Autoload.php') {
+ include_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/TextUI/TestRunner.php';
+ }
}
@include_once 'PHP/Token/Stream/Autoload.php';
-----------------------------------------------------------------------
Summary of changes:
tests/code_and_unit_tests.php | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
