commit 63f31e8cd16b185fd735bd753afbc0375cd573aa
author ZhouyihaiDing <ddyihai@google.com> Mon Sep 18 11:02:55 2017 -0700
committer GitHub <noreply@github.com> Mon Sep 18 11:02:55 2017 -0700
tree ef57dd7ee04501c102be2525372d86403ff1fbbc
parent 3de4c55abe0307f3780be20e7cfe68dbaae3b169
parent e4260e5b445ba01d141e2df2b642a846c5675ffa

Merge pull request #12495 from ZhouyihaiDing/build_php

run_tests.py: embed openssl during building c-core before running build_php.sh

tools/run_tests/run_tests.py

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 591a0be..176c109 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -533,6 +533,7 @@
     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 @@
     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 @@
     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 @@
     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']]