Skip to content

Commit 6cce1a8

Browse files
committed
Disable test.ini, remove more unneeded changes
1 parent 672beb6 commit 6cce1a8

File tree

6 files changed

+8
-14
lines changed

6 files changed

+8
-14
lines changed

.github/scripts/windows/build_task.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ cmd /c configure.bat ^
5959
--enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^
6060
--with-php-build=%DEPS_DIR% ^
6161
%ADD_CONF% ^
62-
--with-test-ini-ext-exclude=snmp,oci8_12c,pdo_oci,pdo_firebird,ldap,imap,ftp
62+
--disable-test-ini
6363

6464
if %errorlevel% neq 0 exit /b 3
6565

ext/com_dotnet/tests/bug77578.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
Bug #77578 (Crash when php unload)
33
--EXTENSIONS--
44
com_dotnet
5-
--SKIPIF--
6-
<?php if (PHP_OS_FAMILY === 'Windows' && getenv('GITHUB_ACTIONS')) die('skip on Windows on GitHub actions'); ?>
75
--FILE--
86
<?php
97
// To actually be able to verify the crash during shutdown on Windows, we have

ext/dl_test/tests/skip.inc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@ if (PHP_OS_FAMILY === 'Windows') {
1212
if (!file_exists($path)) {
1313
die(sprintf('skip dl_test extension is not built (tried %s)', $path));
1414
}
15-
16-
if (PHP_OS_FAMILY === 'Windows' && getenv('GITHUB_ACTIONS')) {
17-
die('skip on Windows on GitHub actions');
18-
}

ext/mysqli/tests/bug73462.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ require_once('skipifconnectfailure.inc');
1111
require_once("connect.inc");
1212

1313
/* Initial persistent connection */
14-
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
14+
$mysql_1 = new mysqli('p:'.$host, $user, $passwd, $db);
1515
$result = $mysql_1->query("SHOW STATUS LIKE 'Connections'");
1616
$c1 = $result->fetch_row();
1717
$result->free();
1818
$mysql_1->close();
1919

2020
/* Failed connection to invalid host */
21-
$mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db, $port);
21+
$mysql_2 = @new mysqli(' !!! invalid !!! ', $user, $passwd, $db);
2222
try {
2323
$mysql_2->close();
2424
} catch (Error $exception) {
2525
echo $exception->getMessage() . "\n";
2626
}
2727

2828
/* Re-use persistent connection */
29-
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db, $port);
29+
$mysql_3 = new mysqli('p:'.$host, $user, $passwd, $db);
3030
$error = mysqli_connect_errno();
3131
$result = $mysql_3->query("SHOW STATUS LIKE 'Connections'");
3232
$c3 = $result->fetch_row();

ext/mysqli/tests/bug73949.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class cc{
1414
function __construct($c=null){
1515
}
1616
};
17-
$i=mysqli_connect('p:'.$host, $user, $passwd, $db, $port);
17+
$i=mysqli_connect('p:'.$host, $user, $passwd, $db);
1818
$res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'");
1919
$t=array(new stdClass);
2020
while($db= mysqli_fetch_object($res,'cc',$t)){}

ext/phar/tests/bug69958.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ $tarphar = new PharData(__DIR__.'/bug69958.tar');
1010
$phar = $tarphar->convertToData(Phar::TAR);
1111
?>
1212
--EXPECTF--
13-
Fatal error: Uncaught BadMethodCallException: phar "%sbug69958.tar" exists and must be unlinked prior to conversion in %sbug69958.php:%d
13+
Fatal error: Uncaught BadMethodCallException: phar "%s/bug69958.tar" exists and must be unlinked prior to conversion in %s/bug69958.php:%d
1414
Stack trace:
15-
#0 %sbug69958.php(%d): PharData->convertToData(%d)
15+
#0 %s/bug69958.php(%d): PharData->convertToData(%d)
1616
#1 {main}
17-
thrown in %sbug69958.php on line %d
17+
thrown in %s/bug69958.php on line %d

0 commit comments

Comments
 (0)