Merge pull request #12495 from ZhouyihaiDing/build_php

run_tests.py: embed openssl during building c-core before running build_php.sh
pull/12621/head
ZhouyihaiDing 7 years ago committed by GitHub
commit 63f31e8cd1
  1. 6
      tools/run_tests/run_tests.py

@ -533,6 +533,7 @@ class PhpLanguage(object):
self.config = config
self.args = args
_check_compiler(self.args.compiler, ['default'])
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
def test_specs(self):
return [self.config.job_spec(['src/php/bin/run_tests.sh'],
@ -545,7 +546,7 @@ class PhpLanguage(object):
return ['static_c', 'shared_c']
def make_options(self):
return []
return self._make_options;
def build_steps(self):
return [['tools/run_tests/helper_scripts/build_php.sh']]
@ -569,6 +570,7 @@ class Php7Language(object):
self.config = config
self.args = args
_check_compiler(self.args.compiler, ['default'])
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
def test_specs(self):
return [self.config.job_spec(['src/php/bin/run_tests.sh'],
@ -581,7 +583,7 @@ class Php7Language(object):
return ['static_c', 'shared_c']
def make_options(self):
return []
return self._make_options;
def build_steps(self):
return [['tools/run_tests/helper_scripts/build_php.sh']]

Loading…
Cancel
Save