diff --git a/.travis.yml b/.travis.yml index 0d9859e7f86e1..27b141c7a213b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ services: env: global: # Set to true for very verbose output - - DEBUG=true + - DEBUG=false matrix: # MariaDB overrides MySQL installation so it's not possible to test both yet #- DB=mysql @@ -155,7 +155,7 @@ before_script: mysql -e "SELECT VERSION();" echo fi - + - | echo "Setting up database" if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then @@ -172,8 +172,8 @@ before_script: echo - | - echo "Setting up Dolibarr" export CONF_FILE=htdocs/conf/conf.php + echo "Setting up Dolibarr $CONF_FILE" echo ' $CONF_FILE echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE @@ -190,15 +190,9 @@ before_script: #fi # TODO: SQLite echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE + cat $CONF_FILE echo -- | - if [ "$DEBUG" = true ]; then - echo "Debugging informations" - cat $CONF_FILE - echo - fi - - | echo "Create documents directory and set permissions" # and admin/temp subdirectory needed for unit tests diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 415a7addf4a92..1e7e721c8ce04 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -165,7 +165,11 @@ $tmp=''; $found=0; $real_dolibarr_main_document_root=str_replace('\\','/',realpath($dolibarr_main_document_root)); // A) Value found into config file, to say where are store htdocs files. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs -$pathroot=$_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup, to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs +if (!empty($_SERVER["DOCUMENT_ROOT"])) { + $pathroot = $_SERVER["DOCUMENT_ROOT"]; // B) Value reported by web server setup, to say where is root of web server instance. Ex: C:/xxx/dolibarr, C:/xxx/dolibarr/htdocs +} else { + $pathroot = 'NOTDEFINED'; +} $paths=explode('/',str_replace('\\','/',$_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part. $concatpath=''; @@ -184,6 +188,7 @@ } //else print "Not found yet for concatpath=".$concatpath."
\n"; } +//print "found=".$found." dolibarr_main_url_root=".$dolibarr_main_url_root."\n"; if (! $found) $tmp=$dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT). else $tmp='http'.(((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"])||$_SERVER["SERVER_PORT"]!=443))?'':'s').'://'.$_SERVER["SERVER_NAME"].((empty($_SERVER["SERVER_PORT"])||$_SERVER["SERVER_PORT"]==80||$_SERVER["SERVER_PORT"]==443)?'':':'.$_SERVER["SERVER_PORT"]).($tmp3?(preg_match('/^\//',$tmp3)?'':'/').$tmp3:''); //print "tmp1=".$tmp1." tmp2=".$tmp2." tmp3=".$tmp3." tmp=".$tmp."\n"; diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 94e8ba1478efb..b746bba91169d 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -30,7 +30,7 @@ //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver //require_once 'PHPUnit/Autoload.php'; require_once dirname(__FILE__).'/../../htdocs/master.inc.php'; - +print 'DOL_MAIN_URL_ROOT='.DOL_MAIN_URL_ROOT."\n"; // constant will be used by other tests if ($langs->defaultlang != 'en_US') @@ -56,6 +56,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1; + /** * Class for the All test suite */