From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 12 Jun 2020 13:41:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb0fa99174fa2af6f626509b85845ff599557615;p=php

Merge branch 'PHP-7.4'
---

cb0fa99174fa2af6f626509b85845ff599557615
diff --cc azure/file_cache_job.yml
index a52b56a216,0000000000..614bd8d1a5
mode 100644,000000..100644
--- a/azure/file_cache_job.yml
+++ b/azure/file_cache_job.yml
@@@ -1,60 -1,0 +1,54 @@@
 +parameters:
 +  configurationName: ''
 +  configurationParameters: ''
 +  runTestsParameters: ''
 +  timeoutInMinutes: 60
 +
 +jobs:
 +  - job: ${{ parameters.configurationName }}
 +    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 +    pool:
 +      vmImage: 'ubuntu-18.04'
 +    steps:
 +    - template: apt.yml
 +    - template: configure.yml
 +      parameters:
 +        configurationParameters: ${{ parameters.configurationParameters }}
 +    - script: make -j$(/usr/bin/nproc) >/dev/null
 +      displayName: 'Make Build'
 +    - template: install.yml
-     - script: |
-         set -e
-         sudo service mysql start
-         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-         sudo -u postgres psql -c "CREATE DATABASE test;"
-       displayName: 'Setup'
++    - template: script.yml
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache (prime)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-prime
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache (use)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-use
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache Only (prime)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-prime
 +          -d opcache.file_cache_only=1
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache Only (use)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-use
 +          -d opcache.file_cache_only=1