From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 28 Aug 2019 16:18:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e04eb283755762a41dd8f0346822b96074ae5cb6;p=php

Merge branch 'PHP-7.4'
---

e04eb283755762a41dd8f0346822b96074ae5cb6
diff --cc azure/i386/job.yml
index 7d7ceeeeff,f93a1a7685..36fb7e8291
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@@ -86,9 -88,4 +88,9 @@@ jobs
        parameters:
          configurationName: ${{ parameters.configurationName }}
          runTestsName: 'OpCache'
-         runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1
+         runTestsParameters: -d zend_extension=opcache.so
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'JIT'
-         runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M
++        runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
diff --cc azure/job.yml
index 4da192cc17,50d1178968..31c0fecb47
--- a/azure/job.yml
+++ b/azure/job.yml
@@@ -91,12 -93,4 +93,12 @@@ jobs
          runTestsName: 'OpCache'
          runTestsParameters: >-
            ${{ parameters.runTestsParameters }}
-           -d zend_extension=opcache.so -d opcache.enable_cli=1
+           -d zend_extension=opcache.so
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'JIT'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
-           -d zend_extension=opcache.so -d opcache.enable_cli=1
++          -d zend_extension=opcache.so
 +          -d opcache.jit_buffer_size=16M
diff --cc azure/macos/job.yml
index 61c5f4a78e,ef1091724d..e7559ca1e5
--- a/azure/macos/job.yml
+++ b/azure/macos/job.yml
@@@ -82,9 -82,4 +82,9 @@@ jobs
        parameters:
          configurationName: ${{ parameters.configurationName }}
          runTestsName: 'OpCache'
-         runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1
+         runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.protect_memory=1
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'JIT'
-         runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M
++        runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M