add special terms import to travis testing and fixup libs

diff --git a/.travis.yml b/.travis.yml
index 68d5be4e1ea9e91e6c1af69ad064b0d7bc6b3f49..5efc9f083171489a6d391896047c52afb322cdda 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ script:
   - cd $TRAVIS_BUILD_DIR/build
   - if [[ $TEST_SUITE == "monaco" ]]; then wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf; fi
   - if [[ $TEST_SUITE == "monaco" ]]; then ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'; fi
   - cd $TRAVIS_BUILD_DIR/build
   - if [[ $TEST_SUITE == "monaco" ]]; then wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf; fi
   - if [[ $TEST_SUITE == "monaco" ]]; then ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'; fi

+  - if [[ $TEST_SUITE == "monaco" ]]; then ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi

   - cd $TRAVIS_BUILD_DIR/test/php
   - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi
   - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 */**.php ; fi
   - cd $TRAVIS_BUILD_DIR/test/php
   - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi
   - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 */**.php ; fi

diff --git a/Vagrantfile b/Vagrantfile
index 15d66e9ed72bfbb158edbbb90c8636ad29afbb8d..b9d618e20f8434c07a9c1acb51a683128cf843fc 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -23,7 +23,16 @@ Vagrant.configure("2") do |config|
       end
   end
 
       end
   end
 

-  config.vm.define "centos" do |sub|
+  config.vm.define "travis" do |sub|
+      sub.vm.box = "bento/ubuntu-14.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/install-on-travis-ci.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end
+  end
+
+   config.vm.define "centos" do |sub|

       sub.vm.box = "bento/centos-7.2"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/install-on-centos-7.sh"
       sub.vm.box = "bento/centos-7.2"
       sub.vm.provision :shell do |s|
         s.path = "vagrant/install-on-centos-7.sh"

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index b2d9a326de5ddccc1051d871c9fe8fa880ac515c..ec0a92dabd4b6ab128c8a9e1c0e29f68e10247cb 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -16,7 +16,7 @@ sudo apt-get install -y -qq libboost-dev libboost-system-dev \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
                             libbz2-dev libpq-dev libgeos-c1 libgeos++-dev libproj-dev \
                             postgresql-server-dev-9.6 postgresql-9.6-postgis-2.3 postgresql-contrib-9.6 \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
                             libbz2-dev libpq-dev libgeos-c1 libgeos++-dev libproj-dev \
                             postgresql-server-dev-9.6 postgresql-9.6-postgis-2.3 postgresql-contrib-9.6 \

-                            apache2 php5 php5-pgsql php-pear php-db php-intl
+                            apache2 php5 php5-pgsql php-pear php-db php5-intl

 
 sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 phpunit php5-cgi
 
 
 sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 phpunit php5-cgi