From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Oct 2019 15:44:50 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=242b5547a2666b2df9833236c335c1db40d5a85a;p=php

Merge branch 'PHP-7.4'
---

242b5547a2666b2df9833236c335c1db40d5a85a
diff --cc azure-pipelines.yml
index 586edf72e8,83925636f9..7b36b7da4c
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@@ -79,6 -79,10 +79,10 @@@ jobs
        parameters:
          configurationName: COMMUNITY
          configurationParameters: >-
 -            --enable-debug --enable-maintainer-zts
 +            --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-maintainer-zts'
++        configurationParameters: '--enable-debug --disable-zts'