diff options
author | kpayson64 <kpayson@google.com> | 2016-07-25 18:42:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-25 18:42:47 -0700 |
commit | 15e5c3f4068405cb55d4a920c7959ecbd536518d (patch) | |
tree | 36d9ec5af901509481a083cad6cc44b801c654bb /tools/run_tests/run_tests.py | |
parent | 8a1247a42c355332e0fc0233c90e1a95009d87a1 (diff) | |
parent | 211a2a0f1266ac741060c0e61a070839e3904cd0 (diff) |
Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile
PHP: add PHP7 to various Jenkins tests and update dockerfile
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-x | tools/run_tests/run_tests.py | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index bb3d090ae1..542415d908 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -381,6 +381,42 @@ class PhpLanguage(object): return 'php' +class Php7Language(object): + + def configure(self, config, args): + self.config = config + self.args = args + _check_compiler(self.args.compiler, ['default']) + + def test_specs(self): + return [self.config.job_spec(['src/php/bin/run_tests.sh'], None, + environ=_FORCE_ENVIRON_FOR_WRAPPERS)] + + def pre_build_steps(self): + return [] + + def make_targets(self): + return ['static_c', 'shared_c'] + + def make_options(self): + return [] + + def build_steps(self): + return [['tools/run_tests/build_php.sh']] + + def post_tests_steps(self): + return [['tools/run_tests/post_tests_php.sh']] + + def makefile_name(self): + return 'Makefile' + + def dockerfile_dir(self): + return 'tools/dockerfile/test/php7_jessie_%s' % _docker_arch_suffix(self.args.arch) + + def __str__(self): + return 'php7' + + class PythonConfig(collections.namedtuple('PythonConfig', [ 'name', 'build', 'run'])): """Tuple of commands (named s.t. 'what it says on the tin' applies)""" @@ -749,6 +785,7 @@ _LANGUAGES = { 'c': CLanguage('c', 'c'), 'node': NodeLanguage(), 'php': PhpLanguage(), + 'php7': Php7Language(), 'python': PythonLanguage(), 'ruby': RubyLanguage(), 'csharp': CSharpLanguage(), |