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 a3963d41357249fcf40a7c0907438e7ebe102914 (commit)
via 0fb00249399dbd5dae89943326bc30a372e6b261 (commit)
via 3b58c8b81bf02c160a6291c767b47bdbe8abd932 (commit)
from af3efa2070a8d24e41500fda642b2166100749aa (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=a3963d41357249fcf40a7c0907438e7ebe102914
commit a3963d41357249fcf40a7c0907438e7ebe102914
Author: Roland Mas <[email protected]>
Date: Mon Oct 30 20:31:05 2017 +0100
Indentation only
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 60e9f0c..1cf9bd8 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -81,9 +81,9 @@ install_selenium() {
else
yum -y install wget firefox
if yum list java-1.7.0-openjdk >/dev/null 2>&1 ; then
- yum install -y java-1.7.0-openjdk
+ yum install -y java-1.7.0-openjdk
else
- yum install -y java-1.6.0
+ yum install -y java-1.6.0
fi
yum --enablerepo=epel install -y php-phpunit-PHPUnit
php-phpunit-PHPUnit-Selenium psmisc patch net-tools
fi
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0fb00249399dbd5dae89943326bc30a372e6b261
commit 0fb00249399dbd5dae89943326bc30a372e6b261
Author: Roland Mas <[email protected]>
Date: Mon Oct 30 20:30:47 2017 +0100
Fixed logic
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 6a357e4..4af46d9 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -53,6 +53,7 @@ require_once $config;
if ($phpunitversion == 4) {
require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
+} else {
class PHPUnit_Extensions_SeleniumTestCase extends
PHPUnit\Extensions\SeleniumTestCase {}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3b58c8b81bf02c160a6291c767b47bdbe8abd932
commit 3b58c8b81bf02c160a6291c767b47bdbe8abd932
Author: Roland Mas <[email protected]>
Date: Mon Oct 30 20:30:40 2017 +0100
Install Composer stuff into /usr/local/share/php
diff --git a/tests/func_tests.php b/tests/func_tests.php
index c68a264..40d5699 100644
--- a/tests/func_tests.php
+++ b/tests/func_tests.php
@@ -3,7 +3,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'AllTests::main');
}
-if (@include_once '/usr/share/php/vendor/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 {}
-----------------------------------------------------------------------
Summary of changes:
tests/func/SeleniumForge.php | 1 +
tests/func_tests.php | 2 +-
tests/func_tests.sh | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
