Merge pull request #311 from nanasess/install-dpkg

Install to dpkg for trusty
EC-CUBE · Sep 17, 2019 · deb171d · deb171d
2 parents 4d5c88c + ef4e5ea
commit deb171d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,7 @@ addons:
     sources:
       - google-chrome
     packages:
+      - dpkg  # see https://github.com/travis-ci/travis-ci/issues/9361
       - google-chrome-stable
 
 env:

diff --git a/tests/require.php b/tests/require.php
@@ -25,6 +25,7 @@ class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
     }
     return $map;
 };
+$loader->add('_generated', __DIR__.'/../ctests/_support');
 $loader->addClassMap($classMap(__DIR__.'/../ctests'));
 $loader->addClassMap($classMap(__DIR__.'/class'));
 return $loader;