diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20198f888be42..a3e71c9bee3fc 100644 --- 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 new file mode 100644 index 0000000000000..3d77bad82ae9b --- /dev/null +++ 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 new file mode 100644 index 0000000000000..b4429c46ac170 --- /dev/null +++ b/azure/alpine_job.yml @@ -0,0 +1,6 @@ +jobs: + - job: ALPINE + pool: + vmImage: 'ubuntu-20.04' + steps: + - script: docker build -f azure/Dockerfile . diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt index 9d77a552ccfc0..624b2d5f66d7d 100644 --- a/ext/date/tests/009.phpt +++ b/ext/date/tests/009.phpt @@ -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 diff --git a/ext/date/tests/bug27780.phpt b/ext/date/tests/bug27780.phpt index f6f21e4185129..331c90c5fff11 100644 --- a/ext/date/tests/bug27780.phpt +++ b/ext/date/tests/bug27780.phpt @@ -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"; diff --git a/ext/date/tests/bug32555.phpt b/ext/date/tests/bug32555.phpt index 03ed09fab49c3..9fcbd8261734a 100644 --- a/ext/date/tests/bug32555.phpt +++ b/ext/date/tests/bug32555.phpt @@ -3,6 +3,7 @@ Bug #32555 (strtotime("tomorrow") can return false) --SKIPIF-- --INI-- date.timezone=US/Eastern diff --git a/ext/date/tests/bug33532.phpt b/ext/date/tests/bug33532.phpt index 5323e8c8db18e..80b87f7e6d87d 100644 --- a/ext/date/tests/bug33532.phpt +++ b/ext/date/tests/bug33532.phpt @@ -6,6 +6,7 @@ date.timezone=UTC --SKIPIF-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE--