php · nikic · Aug 4, 2020 · Aug 4, 2020 · Aug 5, 2020 · Aug 12, 2020
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,83 +12,4 @@ trigger:
       - UPGRADING.INTERNALS
 
 jobs:
-  - template: azure/job.yml
-    parameters:
-      configurationName: DEBUG_NTS
-      configurationParameters: '--enable-debug --disable-zts'
-  - template: azure/job.yml
-    parameters:
-      configurationName: RELEASE_ZTS
-      configurationParameters: '--disable-debug --enable-zts'
-  - template: azure/i386/job.yml
-    parameters:
-      configurationName: I386_DEBUG_ZTS
-      configurationParameters: '--enable-debug --enable-zts'
-  - template: azure/macos/job.yml
-    parameters:
-      configurationName: MACOS_DEBUG_NTS
-      configurationParameters: '--enable-debug --disable-zts'
-  - ${{ if eq(variables['Build.Reason'], 'Schedule') }}:
-    - template: azure/job.yml
-      parameters:
-        configurationName: DEBUG_ZTS
-        configurationParameters: '--enable-debug --enable-zts'
-    - template: azure/job.yml
-      parameters:
-        configurationName: RELEASE_NTS
-        configurationParameters: '--disable-debug --disable-zts'
-    - template: azure/i386/job.yml
-      parameters:
-        configurationName: I386_DEBUG_NTS
-        configurationParameters: '--enable-debug --disable-zts'
-    - template: azure/i386/job.yml
-      parameters:
-        configurationName: I386_RELEASE_NTS
-        configurationParameters: '--disable-debug --disable-zts'
-    - template: azure/i386/job.yml
-      parameters:
-        configurationName: I386_RELEASE_ZTS
-        configurationParameters: '--disable-debug --enable-zts'
-    - template: azure/macos/job.yml
-      parameters:
-        configurationName: MACOS_DEBUG_ZTS
-        configurationParameters: '--enable-debug --enable-zts'
-    - template: azure/macos/job.yml
-      parameters:
-        configurationName: MACOS_RELEASE_NTS
-        configurationParameters: '--disable-debug --disable-zts'
-    - template: azure/macos/job.yml
-      parameters:
-        configurationName: MACOS_RELEASE_ZTS
-        configurationParameters: '--disable-debug --enable-zts'
-    - template: azure/job.yml
-      parameters:
-        configurationName: DEBUG_ZTS_ASAN_UBSAN
-        configurationParameters: >-
-            --enable-debug --enable-zts
-            CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC'
-            LDFLAGS='-fsanitize=undefined,address'
-        runTestsParameters: --asan
-        timeoutInMinutes: 310
-    - template: azure/msan_job.yml
-      parameters:
-        configurationName: DEBUG_ZTS_MSAN
-        configurationParameters: '--enable-debug --enable-zts'
-        runTestsParameters: --asan
-        timeoutInMinutes: 90
-    - template: azure/community_job.yml
-      parameters:
-        configurationName: COMMUNITY
-        configurationParameters: >-
-            --enable-debug --enable-zts
-            CFLAGS='-fsanitize=undefined,address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC'
-            LDFLAGS='-fsanitize=undefined,address'
-    - template: azure/coverage_job.yml
-      parameters:
-        configurationName: COVERAGE_DEBUG_ZTS
-        configurationParameters: '--enable-debug --disable-zts'
-        timeoutInMinutes: 90
-    - template: azure/file_cache_job.yml
-      parameters:
-        configurationName: DEBUG_NTS_FILE_CACHE
-        configurationParameters: '--enable-debug --disable-zts'
+  - template: azure/alpine_job.yml
diff --git a/azure/Dockerfile b/azure/Dockerfile
@@ -0,0 +1,85 @@
+FROM alpine:3.12
+
+RUN apk add \
+    aspell-dev \
+    autoconf \
+    bison \
+    bzip2-dev \
+    curl-dev \
+    freetype-dev \
+    g++ \
+    gcc \
+    gettext-dev \
+    gnu-libiconv-dev \
+    gmp-dev \
+    icu-dev \
+    jpeg-dev \
+    libffi-dev \
+    libpng-dev \
+    libsodium-dev \
+    libwebp-dev \
+    libxml2-dev \
+    libxpm-dev \
+    libxslt-dev \
+    libzip-dev \
+    make \
+    oniguruma-dev \
+    openssl-dev \
+    pkgconf \
+    re2c \
+    readline-dev \
+    sqlite-dev \
+    tidyhtml-dev \
+    tzdata
+
+ENV SKIP_IO_CAPTURE_TESTS=1
+
+WORKDIR /php-src
+COPY . /php-src
+
+RUN ./buildconf
+RUN ./configure \
+    --enable-option-checking=fatal \
+    --enable-debug \
+    --enable-werror \
+    --enable-phpdbg \
+    --enable-fpm \
+    --enable-bcmath \
+    --enable-calendar \
+    --enable-dba \
+    --enable-intl \
+    --enable-exif \
+    --enable-ftp \
+    --enable-gd \
+    --enable-mbstring \
+    --enable-pcntl \
+    --enable-shmop \
+    --enable-soap \
+    --enable-sockets \
+    --enable-sysvmsg \
+    --enable-sysvsem \
+    --enable-sysvshm \
+    --enable-xmlreader \
+    --enable-zend-test \
+    --with-curl \
+    --with-bz2 \
+    --with-iconv=/usr \
+    --with-jpeg \
+    --with-ffi \
+    --with-freetype \
+    --with-gettext \
+    --with-gmp \
+    --with-openssl \
+    --with-pspell \
+    --with-readline \
+    --with-sodium \
+    --with-tidy \
+    --with-webp \
+    --with-xpm \
+    --with-xsl \
+    --with-zip \
+    --with-zlib
+
+RUN make clean && make -j`nproc`
+RUN sapi/cli/php run-tests.php -j`nproc` -q \
+    --show-diff -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP
diff --git a/azure/alpine_job.yml b/azure/alpine_job.yml
@@ -0,0 +1,6 @@
+jobs:
+  - job: ALPINE
+    pool:
+      vmImage: 'ubuntu-20.04'
+    steps:
+      - script: docker build -f azure/Dockerfile .
@@ -13,13 +13,11 @@ $t = mktime(0,0,0, 6, 27, 2006);
 var_dump(strftime(""));
 var_dump(strftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p %r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", $t));
 var_dump(strftime("%%q %%a", $t));
-var_dump(strftime("%q", $t));
 var_dump(strftime("blah", $t));
 
 var_dump(gmstrftime(""));
 var_dump(gmstrftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p %r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", $t));
 var_dump(gmstrftime("%%q %%a", $t));
-var_dump(gmstrftime("%q", $t));
 var_dump(gmstrftime("blah", $t));
 
 echo "Done\n";
@@ -29,12 +27,10 @@ bool(false)
 string(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s
 %s %"
 string(5) "%q %a"
-string(%d) "%s"
 string(4) "blah"
 bool(false)
 string(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s
 %s %"
 string(5) "%q %a"
-string(%d) "%s"
 string(4) "blah"
 Done
@@ -35,7 +35,7 @@ foreach ($timezones as $timezone) {
     foreach ($timestrings as $timestring) {
         $time = strtotime($timestring);
 
-        echo $time, strftime(" [%Y-%m-%d %H:%M:%S %Z]", $time), " [$timestring]\n";
+        echo $time, date(" [Y-m-d H:i:s T]", $time), " [$timestring]\n";
     }
 
     echo "\n";

@@ -3,6 +3,7 @@ Bug #32555 (strtotime("tomorrow") can return false)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') die('skip strftime uses system TZ');
+if (!strftime('%Z')) die('skip strftime does not support %Z');
 ?>
 --INI--
 date.timezone=US/Eastern

@@ -6,6 +6,7 @@ date.timezone=UTC
 --SKIPIF--
 <?php
 if(PHP_OS == 'Darwin' || defined('PHP_WINDOWS_VERSION_MAJOR')) die("skip strftime uses system TZ on Darwin and Windows");
+if (!strftime('%Z')) die('skip strftime does not support %Z');
 ?>
 --FILE--
 <?php

@@ -0,0 +1,10 @@
+<?php
+function require_locale(int $category, ...$locales) {
+    if (setlocale($category, "This locale definitely does not exist")) {
+        die("skip Cannot determine available locales");
+    }
+    if (!setlocale($category, ...$locales)) {
+        $localesStr = implode(", ", $locales);
+        die("skip Locales not available: $localesStr");
+    }
+}
@@ -5,9 +5,8 @@ Test setlocale() function : usage variations - passing multiple valid/invalid lo
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip Not valid for windows');
 }
-if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
-    die('skip en_US.utf8/Ko_KR.utf8/zh_CN.utf8 locales not available');
-}
+require __DIR__ . '/setlocale_skipif.inc';
+require_locale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8");
 ?>
 --FILE--
 <?php

@@ -5,9 +5,8 @@ Test setlocale() function : usage variations - setting system locale = 0
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip Not valid for windows');
 }
-if (setlocale(LC_ALL,'en_US.utf8') === false) {
-    die('skip en_US.utf8 locale not available');
-}
+require __DIR__ . '/setlocale_skipif.inc';
+require_locale(LC_ALL, 'en_US.utf8');
 ?>
 --FILE--
 <?php

@@ -2,9 +2,8 @@
 Test strtoupper on non-ASCII characters
 --SKIPIF--
 <?php
-if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1", "ISO8859-1")) {
-        die("skip locale needed for this test is not supported on this platform");
-}
+require __DIR__ . '/setlocale_skipif.inc';
+require_locale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1", "ISO8859-1");
 ?>
 --FILE--
 <?php

@@ -2,10 +2,11 @@
 Test strptime() function : basic functionality
 --SKIPIF--
 <?php
-	if (!function_exists('strptime')) {
-		die("skip - strptime() function not available in this build");
-	}
-        if(PHP_OS == 'Darwin') die("skip - strptime() behaves differently on Darwin");
+if (!function_exists('strptime')) {
+    die("skip - strptime() function not available in this build");
+}
+if (PHP_OS == 'Darwin') die("skip - strptime() behaves differently on Darwin");
+if (!strftime('%Z')) die('skip strftime does not support %Z');
 ?>
 --FILE--
 <?php

@@ -2,9 +2,10 @@
 Test strptime() function : basic functionality
 --SKIPIF--
 <?php
-	if (!function_exists('strptime')) {
-		die("skip - strptime() function not available in this build");
-	}
+if (!function_exists('strptime')) {
+    die("skip - strptime() function not available in this build");
+}
+if (!strftime('%Z')) die('skip strftime does not support %Z');
 ?>
 --FILE--
 <?php
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ date.timezone=UTC @@
     --SKIPIF--
     <?php
     if(PHP_OS == 'Darwin' || defined('PHP_WINDOWS_VERSION_MAJOR')) die("skip strftime uses system TZ on Darwin and Windows");
+    if (!strftime('%Z')) die('skip strftime does not support %Z');
     ?>
     --FILE--
     <?php
@@ Expand Down @@