projects
/
fusionforge
/
fusionforge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged from 5.1: RBAC bugfix, phpunit 3.6, 5.1.1-7 Debian package
[fusionforge/fusionforge.git]
/
tests
/
func
/
Soap
/
AllTests.php
diff --git
a/tests/func/Soap/AllTests.php
b/tests/func/Soap/AllTests.php
index 751d73512b94dfa25d84635db016aaf036431e52..3df1be5557769341fbf0669e26d9581eb20c1bb8 100644
(file)
--- a/
tests/func/Soap/AllTests.php
+++ b/
tests/func/Soap/AllTests.php
@@
-47,9
+47,11
@@
if (!defined('PHPUnit_MAIN_METHOD')) {
define('PHPUnit_MAIN_METHOD', 'Site_AllTests::main');
}
define('PHPUnit_MAIN_METHOD', 'Site_AllTests::main');
}
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
+if (!@include_once 'PHPUnit/Autoload.php') {
+ include_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+
require_once 'func/config.php';
require_once 'func/Soap/checks.php';
require_once 'func/Soap/login.php';
require_once 'func/config.php';
require_once 'func/Soap/checks.php';
require_once 'func/Soap/login.php';