From fc94e0fc6ee06bff8104f78330f8cd4d093d91e5 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 1 Jul 2019 19:45:32 +0200 Subject: [PATCH] Fix SKIPIF conditions The SKIPIF sections are executed in the directory where run-tests.php is located; therefore a relative path like `../skipif.inc` won't work as desired. --- ext/opcache/tests/jit/assign_001.phpt | 2 +- ext/opcache/tests/jit/assign_002.phpt | 2 +- ext/opcache/tests/jit/assign_003.phpt | 2 +- ext/opcache/tests/jit/assign_004.phpt | 2 +- ext/opcache/tests/jit/assign_005.phpt | 2 +- ext/opcache/tests/jit/assign_006.phpt | 2 +- ext/opcache/tests/jit/assign_007.phpt | 2 +- ext/opcache/tests/jit/assign_008.phpt | 2 +- ext/opcache/tests/jit/assign_009.phpt | 2 +- ext/opcache/tests/jit/assign_010.phpt | 2 +- ext/opcache/tests/jit/assign_011.phpt | 2 +- ext/opcache/tests/jit/assign_012.phpt | 2 +- ext/opcache/tests/jit/assign_013.phpt | 2 +- ext/opcache/tests/jit/assign_014.phpt | 2 +- ext/opcache/tests/jit/assign_015.phpt | 2 +- ext/opcache/tests/jit/assign_016.phpt | 2 +- ext/opcache/tests/jit/assign_017.phpt | 2 +- ext/opcache/tests/jit/assign_018.phpt | 2 +- ext/opcache/tests/jit/assign_019.phpt | 2 +- ext/opcache/tests/jit/assign_020.phpt | 2 +- ext/opcache/tests/jit/assign_021.phpt | 2 +- ext/opcache/tests/jit/assign_022.phpt | 2 +- ext/opcache/tests/jit/assign_023.phpt | 2 +- ext/opcache/tests/jit/assign_024.phpt | 2 +- ext/opcache/tests/jit/assign_025.phpt | 2 +- ext/opcache/tests/jit/assign_026.phpt | 2 +- ext/opcache/tests/jit/assign_027.phpt | 2 +- ext/opcache/tests/jit/assign_028.phpt | 2 +- ext/opcache/tests/jit/assign_029.phpt | 2 +- ext/opcache/tests/jit/assign_030.phpt | 2 +- ext/opcache/tests/jit/assign_031.phpt | 2 +- ext/opcache/tests/jit/assign_032.phpt | 2 +- ext/opcache/tests/jit/assign_033.phpt | 2 +- ext/opcache/tests/jit/assign_034.phpt | 2 +- ext/opcache/tests/jit/assign_035.phpt | 2 +- ext/opcache/tests/jit/assign_036.phpt | 2 +- ext/opcache/tests/jit/assign_dim_002.phpt | 2 +- ext/opcache/tests/jit/cmp_001.phpt | 2 +- ext/opcache/tests/jit/cmp_002.phpt | 2 +- ext/opcache/tests/jit/cmp_003.phpt | 2 +- ext/opcache/tests/jit/const_001.phpt | 2 +- ext/opcache/tests/jit/defined_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_func_args_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_001.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_002.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_003.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_r_004.phpt | 2 +- ext/opcache/tests/jit/fetch_dim_rw_001.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_001.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_002.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_003.phpt | 2 +- ext/opcache/tests/jit/fetch_obj_004.phpt | 2 +- ext/opcache/tests/jit/inc_001.phpt | 2 +- ext/opcache/tests/jit/inc_002.phpt | 2 +- ext/opcache/tests/jit/inc_003.phpt | 2 +- ext/opcache/tests/jit/inc_004.phpt | 2 +- ext/opcache/tests/jit/inc_005.phpt | 2 +- ext/opcache/tests/jit/inc_006.phpt | 2 +- ext/opcache/tests/jit/inc_007.phpt | 2 +- ext/opcache/tests/jit/inc_008.phpt | 2 +- ext/opcache/tests/jit/inc_009.phpt | 2 +- ext/opcache/tests/jit/inc_010.phpt | 2 +- ext/opcache/tests/jit/inc_011.phpt | 2 +- ext/opcache/tests/jit/inc_012.phpt | 2 +- ext/opcache/tests/jit/inc_013.phpt | 2 +- ext/opcache/tests/jit/inc_014.phpt | 2 +- ext/opcache/tests/jit/inc_015.phpt | 2 +- ext/opcache/tests/jit/inc_016.phpt | 2 +- ext/opcache/tests/jit/inc_017.phpt | 2 +- ext/opcache/tests/jit/inc_018.phpt | 2 +- ext/opcache/tests/jit/inc_019.phpt | 2 +- ext/opcache/tests/jit/inc_020.phpt | 2 +- ext/opcache/tests/jit/jmpz_001.phpt | 2 +- ext/opcache/tests/jit/mod_001.phpt | 2 +- ext/opcache/tests/jit/mod_002.phpt | 2 +- ext/opcache/tests/jit/noval_001.phpt | 2 +- ext/opcache/tests/jit/recv_001.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_001.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_002.phpt | 2 +- ext/opcache/tests/jit/reg_alloc_003.phpt | 2 +- ext/opcache/tests/jit/send_var_ex_001.phpt | 2 +- ext/opcache/tests/jit/shift_left_001.phpt | 2 +- ext/opcache/tests/jit/shift_left_002.phpt | 2 +- ext/opcache/tests/jit/shift_right_001.phpt | 2 +- ext/opcache/tests/jit/shift_right_002.phpt | 2 +- ext/opcache/tests/jit/shift_right_003.phpt | 2 +- ext/opcache/tests/jit/skipif.inc | 4 ++++ ext/opcache/tests/jit/switch_jumptable.phpt | 2 ++ ext/opcache/tests/jit/unreachable_block.phpt | 2 +- ext/opcache/tests/skipif.inc | 1 + 90 files changed, 94 insertions(+), 87 deletions(-) create mode 100644 ext/opcache/tests/jit/skipif.inc diff --git a/ext/opcache/tests/jit/assign_001.phpt b/ext/opcache/tests/jit/assign_001.phpt index 8a17a4920f..b52824b900 100644 --- a/ext/opcache/tests/jit/assign_001.phpt +++ b/ext/opcache/tests/jit/assign_001.phpt @@ -7,7 +7,7 @@ opcache.file_update_protection=0 opcache.jit_buffer_size=1M ;opcache.jit_debug=257 --SKIPIF-- - + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- diff --git a/ext/opcache/tests/jit/switch_jumptable.phpt b/ext/opcache/tests/jit/switch_jumptable.phpt index 80df4ac0c2..df59a48c14 100644 --- a/ext/opcache/tests/jit/switch_jumptable.phpt +++ b/ext/opcache/tests/jit/switch_jumptable.phpt @@ -5,6 +5,8 @@ opcache.enable=1 opcache.enable_cli=1 opcache.file_update_protection=0 opcache.jit_buffer_size=1M +--SKIPIF-- + --FILE-- + --FILE-- -- 2.50.1