Update tests

dixyes · Dec 4, 2024 · 630cd3c · 630cd3c
1 parent 70af3d5
commit 630cd3c
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 10 deletions.
diff --git a/ext/tests/swow_coroutine/autoload/require_in_autoload.phpt b/ext/tests/swow_coroutine/autoload/require_in_autoload.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine:
+swow_coroutine/autoload: require in autoload
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/ext/tests/swow_coroutine/autoload/yield_in_autoload.phpt b/ext/tests/swow_coroutine/autoload/yield_in_autoload.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine:
+swow_coroutine/autoload: yield in autoload
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/ext/tests/swow_coroutine/destructor/case.phpt b/ext/tests/swow_coroutine/destructor/case.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine: destructor case
+swow_coroutine/destructor: destructor case
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/ext/tests/swow_coroutine/in_shutdown/bailout_in_main.phpt b/ext/tests/swow_coroutine/in_shutdown/bailout_in_main.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine: bailout in main
+swow_coroutine/in_shutdown: bailout in main
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/ext/tests/swow_coroutine/in_shutdown/bailout_in_shutdown_functions.phpt b/ext/tests/swow_coroutine/in_shutdown/bailout_in_shutdown_functions.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine: bailout in shutdown functions
+swow_coroutine/in_shutdown: bailout in shutdown functions
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/ext/tests/swow_coroutine/in_shutdown/bailout_in_sub_coroutine.phpt b/ext/tests/swow_coroutine/in_shutdown/bailout_in_sub_coroutine.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine: bailout in main
+swow_coroutine/in_shutdown: bailout in main
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/ext/tests/swow_coroutine/in_shutdown/base.phpt b/ext/tests/swow_coroutine/in_shutdown/base.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swow_coroutine: in_shutdown base
+swow_coroutine/in_shutdown: in_shutdown base
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.php';

diff --git a/...tests/swow_misc/deprecated_int_entry.phpt → ...tests/swow_misc/deprecated_ini_entry.phpt b/...tests/swow_misc/deprecated_int_entry.phpt → ...tests/swow_misc/deprecated_ini_entry.phpt
diff --git a/ext/tests/swow_misc/emptier.phpt b/ext/tests/swow_misc/emptier.phpt
@@ -0,0 +1,12 @@
+--TEST--
+swow_misc: empty file
+--SKIPIF--
+<?php
+require __DIR__ . '/../include/skipif.php';
+?>
+--FILE--
+<?php
+echo "Done\n";
+?>
+--EXPECT--
+Done
diff --git a/ext/tests/swow_misc/emptiest.phpt b/ext/tests/swow_misc/emptiest.phpt
@@ -0,0 +1,8 @@
+--TEST--
+swow_misc: empty file
+--SKIPIF--
+<?php
+require __DIR__ . '/../include/skipif.php';
+?>
+--FILE--
+--EXPECT--
diff --git a/ext/tests/swow_misc/weak_dep.phpt b/ext/tests/swow_misc/weak_dep.phpt
@@ -17,17 +17,21 @@ if (
 ) {
     skip('Swow is not present in TEST_PHP_EXECUTABLE and cannot load it via -dextension');
 }
+$loaded3 = shell_exec(PHP_BINARY . " -n -m");
+if (str_contains($loaded3, 'PDO')) {
+    skip('PDO is statically linked in TEST_PHP_EXECUTABLE');
+}
 ?>
 --FILE--
 <?php
 
-// get extension dir
-$extension_dir = shell_exec(PHP_BINARY . " -r \"echo ini_get('extension_dir');\"");
-
 // get TEST_PHP_ARGS TEST_PHP_EXTRA_ARGS
 $args = ' ' . (getenv('TEST_PHP_ARGS') ?: '');
 $args .= ' ' . (getenv('TEST_PHP_EXTRA_ARGS') ?: '');
 
+// get extension dir
+$extension_dir = shell_exec(PHP_BINARY . " $args -r \"echo ini_get('extension_dir');\"");
+
 // remove pdo, make sure swow is loaded before any libpq dynamic lib
 $args = preg_replace('/-d\s*"extension\s*=\s*pdo"/', '', $args);
 $args = preg_replace('/-d\s*"extension\s*=\s*pdo_[^\s]*"/', '', $args);