Permalink
Browse files

UNISH_DRUPAL_MAJOR_VERSION is always 8.

  • Loading branch information...
1 parent c2471d7 commit bcfdf49102a360d215db3cc5aeb68c09b3015d74 @weitzman weitzman committed Nov 30, 2016
Showing with 7 additions and 17 deletions.
  1. +6 −6 .travis.yml
  2. +1 −8 tests/bootstrap.inc
  3. +0 −3 tests/phpunit.xml.dist
View
@@ -25,12 +25,12 @@ sudo: false
env:
matrix:
#D8
- - UNISH_DRUPAL_MAJOR_VERSION=8 PHPUNIT_ARGS=--group=make
- - UNISH_DRUPAL_MAJOR_VERSION=8 PHPUNIT_ARGS=--group=base
- - UNISH_DRUPAL_MAJOR_VERSION=8 PHPUNIT_ARGS=--group=commands
- - UNISH_DRUPAL_MAJOR_VERSION=8 PHPUNIT_ARGS=--group=pm
- - UNISH_DRUPAL_MAJOR_VERSION=8 PHPUNIT_ARGS=--group=quick-drupal
- - UNISH_DRUPAL_MAJOR_VERSION=8 PHPUNIT_ARGS=--exclude-group=base,make,commands,pm,quick-drupal TEST_CHILDREN="drush-ops/config-extra"
+ - PHPUNIT_ARGS=--group=make
+ - PHPUNIT_ARGS=--group=base
+ - PHPUNIT_ARGS=--group=commands
+ - PHPUNIT_ARGS=--group=pm
+ - PHPUNIT_ARGS=--group=quick-drupal
+ - PHPUNIT_ARGS=--exclude-group=base,make,commands,pm,quick-drupal TEST_CHILDREN="drush-ops/config-extra"
# - UNISH_DB_URL=sqlite://none/of/this/matters PHPUNIT_ARGS=--group=make
# - UNISH_DB_URL=sqlite://none/of/this/matters PHPUNIT_ARGS=--group=base
View
@@ -23,14 +23,7 @@ unish_init();
*/
function unish_init() {
// Default drupal major version to run tests over.
- $unish_drupal_major = '8';
- if (getenv('UNISH_DRUPAL_MAJOR_VERSION')) {
- $unish_drupal_major = getenv('UNISH_DRUPAL_MAJOR_VERSION');
- }
- elseif (isset($GLOBALS['UNISH_DRUPAL_MAJOR_VERSION'])) {
- $unish_drupal_major = $GLOBALS['UNISH_DRUPAL_MAJOR_VERSION'];
- }
- define('UNISH_DRUPAL_MAJOR_VERSION', $unish_drupal_major);
+ define('UNISH_DRUPAL_MAJOR_VERSION', '8');
// We read from env then globals then default to mysql.
$unish_db_url = 'mysql://root:@127.0.0.1';
@@ -13,9 +13,6 @@
<php>
<!-- These variables may alternatively be set as environment variables. -->
- <!-- Drupal major version to run tests over -->
- <!-- <var name="UNISH_DRUPAL_MAJOR_VERSION" value="8"/> -->
-
<!--Uncomment and edit one of the lines below depending on DB platform.-->
<!--DB User must have create/drop permissions-->
<!-- <var name="UNISH_DB_URL" value="mysql://root:@127.0.0.1"/> -->

0 comments on commit bcfdf49

Please sign in to comment.