From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 29 Jul 2020 14:39:16 +0000 (+0200)
Subject: Run function JIT tests in nightly build
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34fe1b91f6b9a50e08f643fe222c442b8ed60fad;p=php

Run function JIT tests in nightly build

Changing this for primary x64 and i386 jobs for now.
The different test configurations are now consolidated in one
file shared between both.
---

diff --git a/azure/i386/job.yml b/azure/i386/job.yml
index ec1b118aa3..2aa411e43f 100644
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@ -86,16 +86,7 @@ jobs:
         #sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         #sudo -u postgres psql -c "CREATE DATABASE test;"
       displayName: 'Setup'
-    - template: test.yml
+    - template: ../tests.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'OpCache'
-        runTestsParameters: -d zend_extension=opcache.so
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'JIT'
-        runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
+        runTestsParameters: ${{ parameters.runTestsParameters }}
diff --git a/azure/i386/test.yml b/azure/i386/test.yml
deleted file mode 100644
index 1e2e1d6a1e..0000000000
--- a/azure/i386/test.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-parameters:
-  runTestsName: ''
-  runTestsParameters: ''
-
-steps:
-  - script: |
-      export MYSQL_TEST_USER=root
-      export MYSQL_TEST_PASSWD=root
-      export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
-      export PDO_MYSQL_TEST_USER=root
-      export PDO_MYSQL_TEST_PASS=root
-      export TEST_PHP_JUNIT=junit.xml
-      export REPORT_EXIT_STATUS=no
-      export SKIP_IO_CAPTURE_TESTS=1
-      rm -rf junit.xml | true
-      php run-tests.php -P -q \
-          -j$(/usr/bin/nproc) \
-          -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
-          --offline \
-          --show-diff \
-          --show-slow 1000 \
-          --set-timeout 120 \
-          ${{ parameters.runTestsParameters }}
-    displayName: 'Test ${{ parameters.configurationName }} ${{ parameters.runTestsName }}'
-    condition: or(succeeded(), failed())
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFormat: 'JUnit'
-      testResultsFiles: junit.xml
-      testRunTitle: '${{ parameters.configurationName }} ${{ parameters.runTestsName }}'
-      failTaskOnFailedTests: true
-    displayName: 'Export ${{ parameters.configurationName }} ${{ parameters.runTestsName }} Results'
-    condition: or(succeeded(), failed())
diff --git a/azure/job.yml b/azure/job.yml
index c19cbaf1f8..e21c4c91e0 100644
--- a/azure/job.yml
+++ b/azure/job.yml
@@ -18,22 +18,7 @@ jobs:
       displayName: 'Make Build'
     - template: install.yml
     - template: setup.yml
-    - template: test.yml
+    - template: tests.yml
       parameters:
         configurationName: ${{ parameters.configurationName }}
         runTestsParameters: ${{ parameters.runTestsParameters }}
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'OpCache'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-    - template: test.yml
-      parameters:
-        configurationName: ${{ parameters.configurationName }}
-        runTestsName: 'JIT'
-        runTestsParameters: >-
-          ${{ parameters.runTestsParameters }}
-          -d zend_extension=opcache.so
-          -d opcache.jit_buffer_size=16M
diff --git a/azure/tests.yml b/azure/tests.yml
new file mode 100644
index 0000000000..6142623398
--- /dev/null
+++ b/azure/tests.yml
@@ -0,0 +1,34 @@
+parameters:
+  configurationName: ''
+  runTestsParameters: ''
+
+steps:
+  - template: test.yml
+    parameters:
+      configurationName: ${{ parameters.configurationName }}
+      runTestsParameters: ${{ parameters.runTestsParameters }}
+  - template: test.yml
+    parameters:
+      configurationName: ${{ parameters.configurationName }}
+      runTestsName: 'OpCache'
+      runTestsParameters: >-
+        ${{ parameters.runTestsParameters }}
+        -d zend_extension=opcache.so
+  - ${{ if eq(variables['Build.Reason'], 'Schedule') }}:
+    - template: test.yml
+      parameters:
+        configurationName: ${{ parameters.configurationName }}
+        runTestsName: 'Function JIT'
+        runTestsParameters: >-
+          ${{ parameters.runTestsParameters }}
+          -d zend_extension=opcache.so
+          -d opcache.jit_buffer_size=16M
+          -d opcache.jit=1205
+  - template: test.yml
+    parameters:
+      configurationName: ${{ parameters.configurationName }}
+      runTestsName: 'Tracing JIT'
+      runTestsParameters: >-
+        ${{ parameters.runTestsParameters }}
+        -d zend_extension=opcache.so
+        -d opcache.jit_buffer_size=16M