Skip to content

Simplify requirement of skipif.inc files #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
carusogabriel wants to merge 2 commits into from
Closed

Simplify requirement of skipif.inc files #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0c9eec
Simplify requirement of skipif.inc files
carusogabriel Feb 4, 2018
7429d94
Use require instead of include and *_once
carusogabriel Feb 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug52744.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Bug #52744 (cal_days_in_month incorrect for December 1 BCE)
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
var_dump(cal_days_in_month(CAL_GREGORIAN, 12, -1));
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug53574_1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Bug #53574 (Integer overflow in SdnToJulian; leads to segfault)
--SKIPIF--
<?php
include 'skipif.inc';
require 'skipif.inc';
if (PHP_INT_SIZE != 4) {
die("skip this test is for 32bit platform only");
}
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug53574_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Bug #53574 (Integer overflow in SdnToJulian; leads to segfault)
--SKIPIF--
<?php
include 'skipif.inc';
require 'skipif.inc';
if (PHP_INT_SIZE == 4) {
die("skip this test is for 64bit platform only");
}
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug54254.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Bug #54254 (cal_days_in_month incompatible with jdtojewish in non-leap-years)
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
var_dump(cal_days_in_month(CAL_JEWISH, 1, 5771));
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug55797_1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Bug #55797: Integer overflow in SdnToGregorian leads to segfault (in optimized builds)
--SKIPIF--
<?php
include 'skipif.inc';
require 'skipif.inc';
if (PHP_INT_SIZE != 4) {
die("skip this test is for 32bit platform only");
}
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/bug55797_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Bug #55797: Integer overflow in SdnToGregorian leads to segfault (in optimized builds)
--SKIPIF--
<?php
include 'skipif.inc';
require 'skipif.inc';
if (PHP_INT_SIZE == 4) {
die("skip this test is for 64bit platform only");
}
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_days_in_month.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
cal_days_in_month()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
$num = cal_days_in_month(CAL_GREGORIAN, 8, 2003);
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_days_in_month_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test cal_days_in_month() function : error conditions
--CREDITS--
edgarsandi - <[email protected]>
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
var_dump(cal_days_in_month(-1, 4, 2017));
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_from_jd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
cal_from_jd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
print_r(cal_from_jd(1748326, CAL_GREGORIAN));
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_from_jd_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test cal_from_jd() function : error conditions
--CREDITS--
edgarsandi - <[email protected]>
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
var_dump(cal_from_jd(1748326, -1));
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_info.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cal_info()
--INI--
date.timezone=UTC
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
print_r(cal_info());
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_to_jd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
cal_to_jd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo cal_to_jd(CAL_GREGORIAN, 8, 26, 74), "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/cal_to_jd_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test cal_to_jd() function : error conditions
--CREDITS--
edgarsandi - <[email protected]>
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
var_dump(cal_to_jd(-1, 8, 26, 74));
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/easter_date.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ easter_date()
--INI--
date.timezone=UTC
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
putenv('TZ=UTC');
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/easter_days.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
easter_days()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo easter_days(1999), "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/frenchtojd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
frenchtojd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo frenchtojd(-1,-1,-1), "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/gregoriantojd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
gregoriantojd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo gregoriantojd( 0, 0, 0). "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/gregoriantojd_overflow.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
gregoriantojd()
--SKIPIF--
<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo gregoriantojd(5, 5, 6000000) . "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jddayofweek.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jddayofweek()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
foreach (array(2440588, 2452162, 2453926, -1000) as $jd) {
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdmonthname.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jdmonthname()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
foreach (array(2440588, 2452162, 2453926) as $jd) {
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdtofrench.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jdtofrench()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo jdtofrench(0). "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdtogregorian.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jdtogregorian()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo jdtogregorian(0). "\n";
Expand Down
4 changes: 2 additions & 2 deletions ext/calendar/tests/jdtojewish.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jdtojewish() function
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php

Expand Down Expand Up @@ -39,4 +39,4 @@ string(%d) "2/22/5763
3/16/5765
3/8/13758

Warning: jdtojewish(): Year out of range (0-9999) in %s on line %d
Warning: jdtojewish(): Year out of range (0-9999) in %s on line %d
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdtojewish64.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Bug #64895: Integer overflow in SndToJewish
--SKIPIF--
<?php
include 'skipif.inc';
require 'skipif.inc';
if (PHP_INT_SIZE == 4) {
die("skip this test is for 64bit platform only");
}
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdtojulian.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jdtojulian()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo jdtojulian(0). "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdtounix.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jdtounix()
--INI--
date.timezone=UTC
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo date("Y-m-d",jdtounix(2440588)). "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jdtounix_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edgarsandi - <[email protected]>
--INI--
date.timezone=UTC
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
var_dump(jdtounix(2440579)) . PHP_EOL;
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/jewishtojd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
jewishtojd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo jewishtojd(-1,-1,-1). "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/juliantojd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
juliantojd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo juliantojd( 0, 0, 0). "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/juliantojd_overflow.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
juliantojd()
--SKIPIF--
<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
echo juliantojd(5, 5, 6000000000) . "\n";
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/unixtojd.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
unixtojd()
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--ENV--
TZ=UTC
--FILE--
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/tests/unixtojd_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Test unixtojd() function : error conditions
--CREDITS--
edgarsandi - <[email protected]>
--SKIPIF--
<?php include 'skipif.inc'; ?>
<?php require 'skipif.inc'; ?>
--INI--
date.timezone=UTC
--FILE--
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ctype on integers
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
setlocale(LC_ALL,"C");
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
ctype on strings
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/bug25745.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Bug #25745 (ctype functions fail with non-ascii characters)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
$funcs = array(
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/bug34645.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Bug #34645 (ctype corrupts memory when validating large numbers)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
$id = 394829384;
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alnum_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alnum() function : basic functionality
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alnum(mixed $c)
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alnum_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alnum() function : error conditions - Incorrect number of args
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alnum(mixed $c)
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alnum_variation1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alnum() function : usage variations - Different data types as $c arg
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alnum(mixed $c)
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alnum_variation2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alnum() function : usage variations - different integers
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alnum(mixed $c)
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alnum_variation3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alnum() function : usage variations - different string values
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alnum(mixed $c)
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alnum_variation4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alnum() function : usage variations - octal and hexadecimal values
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alnum(mixed $c)
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/tests/ctype_alpha_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--TEST--
Test ctype_alpha() function : basic functionality
--SKIPIF--
<?php require_once('skipif.inc'); ?>
<?php require 'skipif.inc'; ?>
--FILE--
<?php
/* Prototype : bool ctype_alpha(mixed $c)
Expand Down
Loading