Stop on the 1st skip.

diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt
index b1325be8d311bd4e1e5b3dd6d90fd5d3132bb869..6740411f77a70936624d7f78e368ca16ff759c4b 100644 (file)
--- a/ext/pdo/tests/pdo_001.phpt
+++ b/ext/pdo/tests/pdo_001.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_ASSOC
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt
index ac3355a7fef3474453bca9515ab61b37ac9dcb3b..9de520ba70be6409914de506b28a5fff4fdf9db0 100644 (file)
--- a/ext/pdo/tests/pdo_002.phpt
+++ b/ext/pdo/tests/pdo_002.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_NUM
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt
index 50c1749970ae9168cec39fc2b1bbfced7c648b5b..255eb124cf0b0ba3e5d8dea938dc8147cd174082 100644 (file)
--- a/ext/pdo/tests/pdo_003.phpt
+++ b/ext/pdo/tests/pdo_003.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_BOTH
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt
index c8fd6994403435b76cc7032d601cbb8cacc45618..1f3f0f980ed7feabaab33aa496db8255a747f631 100644 (file)
--- a/ext/pdo/tests/pdo_004.phpt
+++ b/ext/pdo/tests/pdo_004.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_OBJ
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
index 8eb292ac7f092a23c818a58ea50e62c64651d667..9e37665c1e67756141a816084a919308c6f6b5c0 100644 (file)
--- a/ext/pdo/tests/pdo_005.phpt
+++ b/ext/pdo/tests/pdo_005.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_CLASS
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt
index 68fea037d70d246fa7bb9bc45ed3800d53e5862d..90dbe0ba882dba2d5f05cac41d2ddd7f7f35fda5 100644 (file)
--- a/ext/pdo/tests/pdo_006.phpt
+++ b/ext/pdo/tests/pdo_006.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_GROUP
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt
index 7fbd0f5ccf39886f3b3cfa4f7c5de89f56e39d70..49df24061dcbea4ac00c57432737700897e6bbd7 100644 (file)
--- a/ext/pdo/tests/pdo_007.phpt
+++ b/ext/pdo/tests/pdo_007.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_UNIQUE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_008.phpt b/ext/pdo/tests/pdo_008.phpt
index c551b541ea60fa55b6a2c329d9ec2b659bb4d4a8..594ccdab3d1c6aa09f0cff9a9f4d78fadb716c4d 100644 (file)
--- a/ext/pdo/tests/pdo_008.phpt
+++ b/ext/pdo/tests/pdo_008.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_UNIQUE conflict
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index 87890dcadaa94eed46ec928934c01df6762bfdbb..b5527aba39e6670212673c9d101de523a926cc17 100644 (file)
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_CLASSTYPE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index 59e4e5666ede859e633cf56078383312d8425182..6de31d1ea12857ad6f4499ed80fff4bd4be65b1f 100644 (file)
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_CLASSTYPE and GROUP/UNIQUE
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 6fa76ce9802374d3135807cc2682298bd165816a..38ae8ff62af2ebf50c3542289448e27cfd34ea32 100644 (file)
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_FUNC and statement overloading
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index e3b5206231ae7d6d69d9b71fb39b8e85d59fa5fb..f085e903ef6f80adeca3631e9f38fd89ddb3c586 100644 (file)
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDOStatement::setFetchMode
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index db654b0f0f6b4abf2152ac0fa8b52f447c62d8cc..e4cd8d394451f3318b4b85709be739ba59e0ced3 100644 (file)
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDOStatement iterator
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 40ac8e877cee017a288ace81ffbff7a488dd6445..1d21cb4a00df15fa9283ed3a0f29ee2fb4b049e5 100644 (file)
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -2,11 +2,11 @@
 PDO Common: PDOStatement SPL iterator
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 if (!extension_loaded('SPL')) print 'skip SPL not available';
-if (!class_exists('IteratorIterator')) print 'skip IteratorIterator class not present';
+if (!class_exists('IteratorIterator')) die('skip IteratorIterator class not present');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index 29baedfa4956ae0b9f610b9f6d313d376c04eb27..66424060bf31dbdcdfae24559f09343e9d047167 100644 (file)
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_COLUMN
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index 8727275dea73e58becf5be900da3237fc7249622..4581b88f71b78cd695fd0740906d1291d77004f5 100644 (file)
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_BOUND
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index 554bce901e80d200b06d05e19333114e7c09c7eb..ba8d57eeebc1d54d00f2841639d743e7988c19d7 100644 (file)
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -2,9 +2,9 @@
 PDO Common: transactions
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 /* TODO:

diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index 19ef14212807aaa16dd606088e1c37203d4f262f..dce59b25efd1ac7b67e7c726d0b1a2af6d574909 100644 (file)
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -2,10 +2,10 @@
 PDO Common: serializing
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
-if (!interface_exists('Serializable')) print 'skip no Serializable interface';
+if (!extension_loaded('pdo')) die('skip');
+if (!interface_exists('Serializable')) die('skip no Serializable interface');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index 047b6e849545f4855e0a23f480c184395b587f2d..36d70349b37a090703414efc7cecf00239573561 100644 (file)
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -2,9 +2,9 @@
 PDO Common: fetch() and while()
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
index 72474cb85b6f6ac917bcc19a223f81b648eff97e..5e6c68fcc8569901350b1c5af9fb6ae50f2a7da0 100644 (file)
--- a/ext/pdo/tests/pdo_020.phpt
+++ b/ext/pdo/tests/pdo_020.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDOStatement::columnCount
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt
index 7d05ea48737b42c01c8d99eb41b3778f7053486a..e7d7c9d619c3290e084a75fa15bcb7dd4b1d637a 100644 (file)
--- a/ext/pdo/tests/pdo_021.phpt
+++ b/ext/pdo/tests/pdo_021.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDOStatement::execute with parameters
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_022.phpt b/ext/pdo/tests/pdo_022.phpt
index 7567a3ce4bd5e759f45be32fa9898ebb2f9e0624..4a97f0b7f8707345e3b8ebe33432a11b5f976c89 100644 (file)
--- a/ext/pdo/tests/pdo_022.phpt
+++ b/ext/pdo/tests/pdo_022.phpt
@@ -3,9 +3,9 @@ PDO Common: PDOStatement::getColumnMeta
 --SKIPIF--
 <?php # vim:ft=php
 die('skip this feature is not yet finalized, no test makes sense');
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 /*

diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index b1509e5f19f6189c2359d620229c756b24179f62..e6ad370ef53f7141c7c5d81e3a7cb0628ce8d851 100644 (file)
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -2,9 +2,9 @@
 PDO Common: extending PDO
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_024.phpt b/ext/pdo/tests/pdo_024.phpt
index ea0c8130367f2629b76d8e61738c060b9e3216cd..c76c81fbf2548f43ec776d32261895c7cdd777b7 100644 (file)
--- a/ext/pdo/tests/pdo_024.phpt
+++ b/ext/pdo/tests/pdo_024.phpt
@@ -2,9 +2,9 @@
 PDO Common: assert that bindParam does not modify parameter
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index 1e74bab3639ebc21387dd42f10d6000a60515ff1..cc2c162b0688b01f2be8cadeec3cd66773bc4cb0 100644 (file)
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -2,9 +2,9 @@
 PDO Common: PDO_FETCH_INTO
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index 835e82e7eb53d378c4cc02ed85245697a6086b63..87d6b0953249a7659101189a04535319cf5bfbd3 100644 (file)
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -2,9 +2,9 @@
 PDO Common: extending PDO (2)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo')) print 'skip';
+if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
-if (false == $dir) print 'skip no driver';
+if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
 ?>

diff --git a/ext/pdo/tests/pdo_test.inc b/ext/pdo/tests/pdo_test.inc
index 2f1fb3438d3d24fed57ff352cfb60e2d81b348bc..457c25050dcd0d0d0ed3567b88a89aa89bb47bbb 100644 (file)
--- a/ext/pdo/tests/pdo_test.inc
+++ b/ext/pdo/tests/pdo_test.inc
@@ -36,7 +36,7 @@ class PDOTest {
                try {
                        $db = PDOTest::factory();
                } catch (PDOException $e) {
-                       echo "skip " . $e->getMessage();
+                       die("skip " . $e->getMessage());
                }
        }
 }