Single entrypoint for non-phpt tests

Author: arnaud-lb

.github/actions/apk/action.yml

@@ -6,6 +6,8 @@ runs:
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld"
+
         apk update -q
         apk add \
             util-linux \
@@ -53,4 +55,5 @@ runs:
             postgresql14-dev \
             tzdata \
             musl-locales \
-            musl-locales-lang
+            musl-locales-lang \
+            $OPCACHE_TLS_TESTS_DEPS

.github/actions/apt-x32/action.yml

@@ -6,6 +6,8 @@ runs:
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
+
         export DEBIAN_FRONTEND=noninteractive
         dpkg --add-architecture i386
         apt-get update -y | true
@@ -45,4 +47,5 @@ runs:
           re2c \
           unzip \
           wget \
-          zlib1g-dev:i386
+          zlib1g-dev:i386 \
+          $OPCACHE_TLS_TESTS_DEPS

.github/actions/apt-x64/action.yml

@@ -10,6 +10,8 @@ runs:
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
+
         export DEBIAN_FRONTEND=noninteractive
 
         # Install sudo in Docker for consistent actions
@@ -74,4 +76,5 @@ runs:
           libqdbm-dev \
           libjpeg-dev \
           libpng-dev \
-          libfreetype6-dev
+          libfreetype6-dev \
+          $OPCACHE_TLS_TESTS_DEPS \

.github/actions/extra-tests/action.yml

@@ -0,0 +1,16 @@
+name: Extra tests
+inputs:
+  debug:
+    default: 'false'
+    required: false
+  os:
+    default: ''
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: sh
+      run: |
+        TEST_PHP_OS=${{ inputs.os }} \
+        TEST_PHP_DEBUG=${{ inputs.debug }} \
+        sapi/cli/php run-extra-tests.php

.github/actions/freebsd/action.yml

@@ -17,6 +17,8 @@ runs:
         prepare: |
           cd $GITHUB_WORKSPACE
 
+          OPCACHE_TLS_TESTS_DEPS="gcc"
+
           kldload accf_http
           pkg install -y \
             autoconf \
@@ -42,7 +44,7 @@ runs:
             libavif \
             `#sqlite3` \
             curl \
-            gcc
+            $OPCACHE_TLS_TESTS_DEPS
 
           ./buildconf -f
           CC=clang CXX=clang++ \
@@ -110,8 +112,3 @@ runs:
             --show-slow 1000 \
             --set-timeout 120 \
             -d zend_extension=opcache.so
-
-          export TLSC=$(pwd)/ext/opcache/jit/tls/zend_jit_tls_x86_64.c
-          if sapi/cli/php -r 'exit(!PHP_ZTS);'; then
-            ./ext/opcache/jit/tls/testing/test.sh
-          fi

.github/actions/test-tls-alpine/action.yml

@@ -134,8 +134,10 @@ jobs:
             --asan -x
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Test TLS resolution
-        uses: ./.github/actions/test-tls-alpine
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
+        with:
+          debug: true
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
@@ -268,9 +270,10 @@ jobs:
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Test TLS resolution
-        if: matrix.debug && matrix.zts && !matrix.asan
-        uses: ./.github/actions/test-tls-x64
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
+        with:
+          debug: ${{ matrix.debug }}
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -360,9 +363,10 @@ jobs:
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Test TLS resolution
-        if: matrix.debug && matrix.zts
-        uses: ./.github/actions/test-tls-x32
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
+        with:
+          debug: ${{ matrix.debug }}
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
@@ -422,10 +426,10 @@ jobs:
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Test TLS resolution
-        # JIT+ZTS not supported yet on ARM64
-        if: matrix.os != '14' && matrix.debug && matrix.zts
-        uses: ./.github/actions/test-tls-macos
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
+        with:
+          debug: ${{ matrix.debug }}
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack