Add SKIPIF sectionis and "stdout" recovery code

dstogov · dstogov · commit f0b86fae2fba · 2024-10-22T10:31:31.000+03:00
diff --git a/ext/ffi/tests/jit/001_var_read_scalar.phpt b/ext/ffi/tests/jit/001_var_read_scalar.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
diff --git a/ext/ffi/tests/jit/002_var_read_array.phpt b/ext/ffi/tests/jit/002_var_read_array.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
diff --git a/ext/ffi/tests/jit/003_var_read_struct.phpt b/ext/ffi/tests/jit/003_var_read_struct.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
diff --git a/ext/ffi/tests/jit/004_var_read_struct_ptr.phpt b/ext/ffi/tests/jit/004_var_read_struct_ptr.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
diff --git a/ext/ffi/tests/jit/005_var_read_func.phpt b/ext/ffi/tests/jit/005_var_read_func.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
diff --git a/ext/ffi/tests/jit/006_var_write_scalar.phpt b/ext/ffi/tests/jit/006_var_write_scalar.phpt
@@ -8,17 +8,27 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
   $ffi = FFI::cdef(<<<EOF
     extern int64_t stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout = $i;
   }
   var_dump($ffi->stdout);
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/007_var_write_scalar_cdata.phpt b/ext/ffi/tests/jit/007_var_write_scalar_cdata.phpt
@@ -8,19 +8,29 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
   $ffi = FFI::cdef(<<<EOF
     extern int64_t stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   $x = $ffi->cast('int64_t', 42);
   var_dump($x);
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout = $x;
   }
   var_dump($ffi->stdout);
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/008_var_write_struct_ptr_null.phpt b/ext/ffi/tests/jit/008_var_write_struct_ptr_null.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern uintptr_t stdout;", "libc.so.6");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
@@ -16,10 +24,12 @@ function test() {
     extern FILE *stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout = null;
   }
   var_dump($ffi->stdout);
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/009_var_write_struct_ptr_cdata.phpt b/ext/ffi/tests/jit/009_var_write_struct_ptr_cdata.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
@@ -16,13 +24,15 @@ function test() {
     extern FILE *stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   $x = $ffi->cast('FILE*', 42);
   var_dump($x);
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout = $x;
   }
   var_dump($ffi->stdout);
   var_dump($ffi->cast('intptr_t', $ffi->stdout));
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/010_var_modify_scalar.phpt b/ext/ffi/tests/jit/010_var_modify_scalar.phpt
@@ -8,18 +8,28 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
   $ffi = FFI::cdef(<<<EOF
     extern int64_t stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   $ffi->stdout = null;
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout += $i;
   }
   var_dump($ffi->stdout);
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/011_var_modify_struct_ptr.phpt b/ext/ffi/tests/jit/011_var_modify_struct_ptr.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
@@ -16,11 +24,13 @@ function test() {
     extern FILE *stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   $ffi->stdout = $ffi->cast('FILE*', 42);
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout += $i;
   }
   var_dump($ffi->cast('intptr_t', $ffi->stdout));
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/012_var_write_scalar_ret.phpt b/ext/ffi/tests/jit/012_var_write_scalar_ret.phpt
@@ -8,17 +8,27 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
   $ffi = FFI::cdef(<<<EOF
     extern int64_t stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   for ($i = 0; $i < 5; $i++) {
   	$ret = $ffi->stdout = $i;
   }
   var_dump($ffi->stdout, $ret);
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/030_var_inc_scalar.phpt b/ext/ffi/tests/jit/030_var_inc_scalar.phpt
@@ -8,18 +8,28 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
   $ffi = FFI::cdef(<<<EOF
-    extern int64_t stdout;
+    extern intptr_t stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
   $ffi->stdout = null;
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout++;
   }
   var_dump($ffi->stdout);
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/031_var_dec_ptr.phpt b/ext/ffi/tests/jit/031_var_dec_ptr.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
@@ -16,11 +24,14 @@ function test() {
     extern FILE *stdout;
     EOF, 'libc.so.6');
 
+  $old = $ffi->stdout;
+  $ffi->stdout = $old;
   $ffi->stdout = $ffi->cast('FILE*', 42);
   for ($i = 0; $i < 5; $i++) {
   	$ffi->stdout--;
   }
   var_dump($ffi->cast('intptr_t', $ffi->stdout));
+  $ffi->stdout = $old;
 }
 test();
 ?>
diff --git a/ext/ffi/tests/jit/040_call.phpt b/ext/ffi/tests/jit/040_call.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("void printf(void);");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test($name) {
diff --git a/ext/ffi/tests/jit/041_call_tmp_scalar.phpt b/ext/ffi/tests/jit/041_call_tmp_scalar.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern uintptr_t stdout; void fprintf(void);", "libc.so.6");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test($name) {
diff --git a/ext/ffi/tests/jit/042_call_tmp_cdata.phpt b/ext/ffi/tests/jit/042_call_tmp_cdata.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern uintptr_t stdout; void fprintf(void);", "libc.so.6");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test($name) {
diff --git a/ext/ffi/tests/jit/050_isNull.phpt b/ext/ffi/tests/jit/050_isNull.phpt
@@ -8,6 +8,14 @@ opcache.jit_hot_func=0
 opcache.jit_hot_return=0
 opcache.jit_hot_side_exit=0
 ;opcache.jit_debug=0x180005
+--SKIPIF--
+<?php
+try {
+    $libc = FFI::cdef("extern intptr_t stdout;");
+} catch (Throwable $_) {
+    die('skip libc.so.6 not available');
+}
+?>
 --FILE--
 <?php 
 function test() {
diff --git a/ext/ffi/tests/jit/069_addr.phpt b/ext/ffi/tests/jit/069_addr.phpt
