Ticket #5708: 5708.patch

.travis.yml

@@ +1 @@
+# Travis CI Configuration File
+
+# Tell Travis CI we're using PHP
 language: php
 
+# PHP version used in first build configuration.
 php:
     - 5.2
     - 5.3
@@ -6 +10 @@
     - 5.4
     - 5.5
 
+# WordPress versions uses Git 'develop' repo branches
 env:
-    - WP_VERSION=trunk
-    - WP_VERSION=tags/3.9
-    - WP_VERSION=tags/3.8.3
-    - WP_VERSION=tags/3.7.3
+    - WP_VERSION=master # Git equivalent of SVN /trunk
+    - WP_VERSION=3.9    # Includes latest 3.9.x release
+    - WP_VERSION=3.8    # Includes latest 3.8.x release
+    - WP_VERSION=3.7    # Includes latest 3.7.x release
 
+# Build matrix options
 matrix:
   include:
     - php: 5.6
-      env: WP_VERSION=trunk
+      env: WP_VERSION=master
+    - php: hhvm
+      env: WP_VERSION=master
   allow_failures:
     - php: 5.6
+    - php: hhvm
+  fast_finish: true
 
-before_script:
-    # set up WP install
-    - WP_CORE_DIR=/tmp/wordpress/
-    - mkdir -p $WP_CORE_DIR
-    - svn co --ignore-externals https://develop.svn.wordpress.org/$WP_VERSION $WP_CORE_DIR
-    - plugin_slug=$(basename $(pwd))
-    - plugin_dir=$WP_CORE_DIR/src/wp-content/plugins/$plugin_slug
-    - cd ..
-    - mv $plugin_slug $plugin_dir
-    # set up tests config
-    - cd $WP_CORE_DIR
+# Before install, failures in this section will result in build status 'errored'
+before_install:
+    # setup WP_DEVELOP_DIR (needed for BuddyPress to bootstrap WP PHPUnit tests)
+    - WP_DEVELOP_DIR=/tmp/wordpress
+    # clone the WordPress develop repo
+    - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
+    - mv $TRAVIS_BUILD_DIR /tmp/wordpress/src/wp-content/plugins/buddypress
+    - cd $WP_DEVELOP_DIR
+    # setub db
+    - mysql -e "CREATE DATABASE wordpress_test;" -uroot
+    # setub wp-config
     - cp wp-tests-config-sample.php wp-tests-config.php
     - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
     - sed -i "s/yourusernamehere/root/" wp-tests-config.php
     - sed -i "s/yourpasswordhere//" wp-tests-config.php
-    # disable WP_DEBUG for PHP 5.5 due to ext/mysqli E_DEPRECATED errors
-    - if [[ "$TRAVIS_PHP_VERSION" == 5.5* ]] ; then sed -i "s:define( 'WP_DEBUG://define( 'WP_DEBUG:" wp-tests-config.php; fi;
-    # set up database
-    - mysql -e 'CREATE DATABASE wordpress_test;' -uroot
-    # prepare for running the tests
-    - cd $plugin_dir
+    # disable WP_DEBUG for PHP 5.5 and WordPress 3.7 branch due to ext/mysqli E_DEPRECATED errors
+    - if [ "$TRAVIS_PHP_VERSION" == "5.5" ] && [ "$WP_VERSION" == "3.7" ]; then sed -i "s:define( 'WP_DEBUG://define( 'WP_DEBUG:" wp-tests-config.php; fi;
+    # prepare for running BuddyPress' tests
+    - BP_DEVELOP_DIR=$WP_DEVELOP_DIR/src/wp-content/plugins/buddypress
+    - cd $BP_DEVELOP_DIR
+    # 'build' BuddyPress
     - npm install -g grunt-cli
+
+# Before script, failures in this section will result in build status 'failed'
+before_script:
     - npm install
 
 script: grunt travis

tests/phpunit/includes/define-constants.php

@@ -23 +23 @@
 if ( false !== getenv( 'WP_TESTS_DIR' ) ) {
         define( 'WP_TESTS_DIR', getenv( 'WP_TESTS_DIR' ) );
         define( 'WP_ROOT_DIR', WP_TESTS_DIR );
-} else {
-        // Support WP_DEVELOP_DIR, as used by some plugins
-        if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) {
-                define( 'WP_ROOT_DIR', getenv( 'WP_DEVELOP_DIR' ) );
-        } else {
-                define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) ) ) );
-        }
 
+// Support WP_DEVELOP_DIR, as used by some plugins
+} else if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) {
+        define( 'WP_ROOT_DIR', getenv( 'WP_DEVELOP_DIR' ) );
         define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
+
+// Support Travis CI build environment
+} else if ( false !== getenv( 'TRAVIS' ) ) {
+        define( 'WP_ROOT_DIR', '/tmp/wordpress' );
+        define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
+
+} else {
+        define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) ) ) );
+        define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
 }
 
 // Based on the tests directory, look for a config file