Merge pull request #736

Author: jmikola

.gitignore

@@ -6,7 +6,7 @@
 acinclude.m4
 aclocal.m4
 autom4te.cache
-build
+/build
 config.guess
 config.h
 config.h.in
@@ -49,7 +49,7 @@ php.ini
 !.github/
 !tests/utils/*.php
 !.travis.yml
-!.travis.scripts/*
+!.travis.scripts/
 
 
 !scripts

.travis.scripts/before_install.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+    # https://github.com/eddyxu/cpp-coveralls#linux
+    pip install --user cpp-coveralls
+fi
+
+if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+    brew update
+    brew upgrade
+
+    brew tap homebrew/homebrew-php
+    brew install "${PHP_VERSION}"
+
+    # http://brewformulas.org/Lcov
+    brew install lcov
+
+    # https://github.com/eddyxu/cpp-coveralls#os-x
+    brew install pyenv
+    eval "$(pyenv init -)"
+    pyenv install 2.7.6
+    pyenv global 2.7.6
+    pyenv rehash
+    pip install cpp-coveralls
+    pyenv rehash
+fi

.travis.scripts/before_script.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+CONFIGURE_OPTS="--enable-developer-flags --enable-coverage"
+
+if [ -n "${SSL_VERSION}" ]; then
+    CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-mongodb-ssl=${SSL_VERSION}"
+fi
+
+phpize
+./configure ${CONFIGURE_OPTS}
+make all -j4
+make install
+
+# Add the extension to php.ini
+echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+
+# Predefine the test server
+echo '{"STANDALONE": "mongodb:\/\/127.0.0.1:27017"}' > /tmp/PHONGO-SERVERS.json

.travis.scripts/compile.sh

@@ -1,5 +1,10 @@
 #!/bin/sh
 
-PHP=/home/travis/.phpenv/versions/`php -r 'echo PHP_VERSION;'`/bin/php
-echo "backtrace full" | gdb $PHP $1
+if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
+    # https://www.ics.uci.edu/~pattis/common/handouts/macmingweclipse/allexperimental/mac-gdb-install.html
+    echo "Cannot debug core files on macOS: ${1}"
+    exit 1
+fi
 
+PHP_BINARY=`which php`
+gdb -batch -ex "bt full" -ex "quit" "${PHP_BINARY}" "${1}"

.travis.scripts/debug-core.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+EXP=`echo $1 | sed 's/.diff$/.exp/'`
+OUT=`echo $1 | sed 's/.diff$/.out/'`
+SEP="--------------------------------------------------------------------------------"
+
+echo $EXP
+echo $SEP
+cat $EXP; echo
+echo $SEP; echo
+
+echo $OUT
+echo $SEP
+cat $OUT; echo
+echo $SEP; echo

.travis.scripts/debug-diff.sh

@@ -1,10 +1,33 @@
 language: php
-php:
-  - 7.2
-  - 7.1
-  - 7.0
-  - 5.6
-  - 5.5
+
+addons:
+  apt:
+    packages:
+      - gdb
+      - lcov
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: false
+      php: 5.5
+    - os: linux
+      dist: trusty
+      sudo: false
+      php: 5.6
+    - os: linux
+      dist: trusty
+      sudo: false
+      php: 7.0
+    - os: linux
+      dist: trusty
+      sudo: false
+      php: 7.1
+    - os: linux
+      dist: trusty
+      sudo: false
+      php: 7.2
 
 services:
   - mongodb
@@ -13,24 +36,15 @@ env:
   global:
     - TEST_PHP_ARGS="-q -s output.txt -g XFAIL,FAIL,BORK,WARN,LEAK,SKIP -x --show-diff"
     - REPORT_EXIT_STATUS=1
-    - MONGODB_ORCHESTRATION="http://localhost:8889"
-    - MONGODB_ORCHESTRATION_REPO="git+git://github.com/mongodb/mongo-orchestration@master"
-    - MONGODB_ORCHESTRATION_PRESETS_ROOT=`pwd`
-    - secure: "Dofd9NvXIKEat1PMiia3RQgNsJLaKtzZRf9rM4MsqFaBQPbJmVWPANJkayJPcK+l8pLxHyzzH7WqxML+SlBhBTHdJB++1woXxoVwm+sDdwSye6e+eXc3/zRUxb7zyItBZcvVp2tIJpx5kXJb+CoUQakbfWEQQFk4xrOF0R56+8Y="
-    - secure: "pfGVPucvgcgcefhtzAVeejlpOtn4TnAqJSTM8mJkBl36KdU9P7hMuD3czQ4drWgzZ373/VT5UVhLu/HNsdbW0YBTeqPKJ4YNjqVVLytI8xT7y2Lw9l+I7o93j98TMgAoo8nVRmp/E4D6yutbKK1eddrcmf899R1iJbw8v8d1Ht8="
 
 before_install:
-  - sudo pip install --upgrade cpp-coveralls
-  - sudo pip install ${MONGODB_ORCHESTRATION_REPO}
-  - sudo apt-get update
-  - sudo apt-get install gdb valgrind
-  - sudo apt-get install cdbs debhelper build-essential python-lxml
+  - .travis.scripts/before_install.sh
   - php -r 'if ( ! ($f = php_ini_loaded_file())) { $f = PHP_CONFIG_FILE_PATH . "/php.ini"; } file_put_contents($f, "variables_order=EGPCS\n", FILE_APPEND); $a = file($f, FILE_IGNORE_NEW_LINES); var_dump($a[count($a)-1]);'
 
 before_script:
   - ulimit -a
   - ulimit -c unlimited || true
-  - "./.travis.scripts/compile.sh"
+  - .travis.scripts/before_script.sh
 
 script:
   - make test
@@ -39,5 +53,5 @@ after_success:
   - make coveralls
 
 after_failure:
-  - find . -name \*core\* -exec ./.travis.scripts/debug-core.sh {} \;
-  - find . -name \*diff -exec ./.travis.scripts/debug-script.sh {} \;
+  - find . -name 'core*' -exec .travis.scripts/debug-core.sh {} \;
+  - find . -name '*.diff' -exec .travis.scripts/debug-diff.sh {} \;