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  36c22b9744e1daec65e516176bb9223d3bac4dfd (commit)
      from  37e80a43062ad0f47242a88e089fd40aa30d89c6 (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=36c22b9744e1daec65e516176bb9223d3bac4dfd

commit 36c22b9744e1daec65e516176bb9223d3bac4dfd
Author: Roland Mas <[email protected]>
Date:   Tue Nov 10 18:09:29 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 c9c56d6..045effc 100644
--- a/tests/code_and_unit_tests.php
+++ b/tests/code_and_unit_tests.php
@@ -22,17 +22,18 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
        define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-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 'PHPUnit/Autoload.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';
 @include_once 'Text/Template/Autoload.php';

-----------------------------------------------------------------------

Summary of changes:
 tests/code_and_unit_tests.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to