From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 7 Jul 2005 15:32:32 +0000 (+0000)
Subject: Stop on the 1st skip.
X-Git-Tag: php-5.1.0b3~125
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=721687e11c7158490de38c8780d70e6f67da24b1;p=php

Stop on the 1st skip.
---

diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt
index b1325be8d3..6740411f77 100644
--- 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 ac3355a7fe..9de520ba70 100644
--- 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 50c1749970..255eb124cf 100644
--- 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 c8fd699440..1f3f0f980e 100644
--- 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 8eb292ac7f..9e37665c1e 100644
--- 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 68fea037d7..90dbe0ba88 100644
--- 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 7fbd0f5ccf..49df24061d 100644
--- 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 c551b541ea..594ccdab3d 100644
--- 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 87890dcada..b5527aba39 100644
--- 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 59e4e5666e..6de31d1ea1 100644
--- 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 6fa76ce980..38ae8ff62a 100644
--- 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 e3b5206231..f085e903ef 100644
--- 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 db654b0f0f..e4cd8d3944 100644
--- 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 40ac8e877c..1d21cb4a00 100644
--- 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 29baedfa49..66424060bf 100644
--- 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 8727275dea..4581b88f71 100644
--- 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 554bce901e..ba8d57eeeb 100644
--- 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 19ef142128..dce59b25ef 100644
--- 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 047b6e8495..36d70349b3 100644
--- 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 72474cb85b..5e6c68fcc8 100644
--- 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 7d05ea4873..e7d7c9d619 100644
--- 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 7567a3ce4b..4a97f0b7f8 100644
--- 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 b1509e5f19..e6ad370ef5 100644
--- 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 ea0c813036..c76c81fbf2 100644
--- 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 1e74bab363..cc2c162b06 100644
--- 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 835e82e7eb..87d6b09532 100644
--- 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 2f1fb3438d..457c25050d 100644
--- 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());
 		}
 	}
 }