diff --git a/.travis.yml b/.travis.yml index 6bacbd51fd..d73bc73ed7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - echo "extension=php_mapscript.so" | sudo tee -a /etc/php5/cli/php.ini install: - - ./configure --with-gd --with-postgis --with-wmsclient --with-wfsclient --with-kml --with-cairo --with-wcs --with-proj --with-geos --with-gdal --with-ogr --with-wfs --with-sos --with-php + - ./configure --prefix=/usr --with-gd --with-postgis --with-wmsclient --with-wfsclient --with-kml --with-cairo --with-wcs --with-proj --with-geos --with-gdal --with-ogr --with-wfs --with-sos --with-php - make -j4 - sudo make install diff --git a/msautotest b/msautotest index f02ba061bf..a55ab7864c 160000 --- a/msautotest +++ b/msautotest @@ -1 +1 @@ -Subproject commit f02ba061bfe52c3137a0d6b9460be74c6a94e6aa +Subproject commit a55ab7864c58d344a11b4fe862599bcf6af4e647 diff --git a/runtests.sh b/runtests.sh index 388b86ad77..31c5bb01b3 100755 --- a/runtests.sh +++ b/runtests.sh @@ -49,7 +49,6 @@ done # PHP tests cd msautotest/php ./run_test.py -echo `which phpunit` if [ ! "$?" -eq 0 ]; then ret=1 fi