From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 27 Dec 2019 14:11:51 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fafa19777efb50810c7d3e7fb08f66f2e868e7d;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Skip test for clang builds
---

3fafa19777efb50810c7d3e7fb08f66f2e868e7d
diff --cc ext/ffi/tests/bug78270_1.phpt
index 7ad9776c7f,203e8c330a..c918393bd9
--- a/ext/ffi/tests/bug78270_1.phpt
+++ b/ext/ffi/tests/bug78270_1.phpt
@@@ -5,7 -5,12 +5,12 @@@ FR #78270 (Usage of __vectorcall conven
  require_once('skipif.inc');
  if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only");
  
+ ob_start();
+ phpinfo(INFO_GENERAL);
+ $info = ob_get_clean();
+ if (preg_match('/Compiler => .*clang.*/', $info)) die("skip not for clang");
+ 
 -$dll = 'php7' . (PHP_ZTS ? 'ts' : '') . (PHP_DEBUG ? '_debug' : '') . '.dll';
 +$dll = 'php8' . (PHP_ZTS ? 'ts' : '') . (PHP_DEBUG ? '_debug' : '') . '.dll';
  try {
      FFI::cdef(<<<EOC
          __vectorcall int zend_atoi(const char *str, size_t str_len);