From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 18 Mar 2020 16:01:30 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddf38fd76465c4c74e36e085bbb0ad97541067b5;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Improve FFI test suite for Windows
---

ddf38fd76465c4c74e36e085bbb0ad97541067b5
diff --cc ext/ffi/tests/100.phpt
index 27b6d0be08,572052f372..634d8d4436
--- a/ext/ffi/tests/100.phpt
+++ b/ext/ffi/tests/100.phpt
@@@ -13,23 -14,18 +14,18 @@@ try 
  ffi.enable=1
  --FILE--
  <?php
- // Check if target supports "fastcall" calling convention
- try {
-     FFI::cdef("extern size_t __attribute__((fastcall)) (*zend_printf)(const char *format);");
-     $fastcall = "__attribute__((fastcall)) ";
- } catch (Throwable $e) {
-     $fastcall = "";
- }
- $zend = FFI::cdef("
+ require_once('utils.inc');
+ $fastcall = ffi_get_fastcall_specifier();
+ $zend = ffi_cdef("
 -	const char *get_zend_version(void);
 -	//char *get_zend_version(void);
 -	extern size_t (*zend_printf)(const char *format, ...);
 +    const char *get_zend_version(void);
 +    //char *get_zend_version(void);
 +    extern size_t (*zend_printf)(const char *format, ...);
  
 -	unsigned long $fastcall zend_hash_func(const char *str, size_t len);
 +    unsigned long $fastcall zend_hash_func(const char *str, size_t len);
  
 -	void $fastcall zend_str_tolower(char *str, size_t length);
 +    void $fastcall zend_str_tolower(char *str, size_t length);
  
- ");
+ ", ffi_get_php_dll_name());
  var_dump(trim(explode("\n",$zend->get_zend_version())[0]));
  //var_dump(trim(FFI::string($zend->get_zend_version())));
  var_dump($zend->zend_printf);
diff --cc ext/ffi/tests/200.phpt
index 69d0aafd04,205c0ebab2..e80d1ed08c
--- a/ext/ffi/tests/200.phpt
+++ b/ext/ffi/tests/200.phpt
@@@ -11,13 -12,13 +12,14 @@@ try 
  ?>
  --INI--
  ffi.enable=1
 +opcache.jit=0
  --FILE--
  <?php
+ require_once('utils.inc');
  $zend = FFI::cdef("
 -	typedef int (*zend_write_func_t)(const char *str, size_t str_length);
 -	extern zend_write_func_t zend_write;
 +    typedef int (*zend_write_func_t)(const char *str, size_t str_length);
 +    extern zend_write_func_t zend_write;
- ");
+ ", ffi_get_php_dll_name());
  
  echo "Hello World!\n";
  
diff --cc ext/ffi/tests/bug79096.phpt
index d8d89f05bc,a45b45646a..d7470eb302
--- a/ext/ffi/tests/bug79096.phpt
+++ b/ext/ffi/tests/bug79096.phpt
@@@ -7,10 -7,11 +7,11 @@@ if (!extension_loaded('zend-test')) die
  ?>
  --FILE--
  <?php
+ require_once('utils.inc');
  $header = <<<HEADER
  struct bug79096 {
 -	uint64_t a;
 -	uint64_t b;
 +    uint64_t a;
 +    uint64_t b;
  };
  
  struct bug79096 bug79096(void);