-specify reason if connection is not specified

-remove unnecessary sections

diff --git a/ext/dbx/tests/001.phpt b/ext/dbx/tests/001.phpt
index 2281426230f9d81970130ac66207757606835ad7..e8f30f7c1a09882eb6a3d8fb27af5d85bd42e698 100644 (file)
--- a/ext/dbx/tests/001.phpt
+++ b/ext/dbx/tests/001.phpt
@@ -2,8 +2,6 @@
 Check for dbx presence
 --SKIPIF--
 <?php if (!extension_loaded("dbx")) print("skip"); ?>
---POST--
---GET--
 --FILE--
 <?php 
 print("dbx extension is available");

diff --git a/ext/dbx/tests/002.phpt b/ext/dbx/tests/002.phpt
index f9dff86155941b30b44b29c4ddd65e412f26d24c..391a3fa688fe9df99e63e28bb957f80015634777 100644 (file)
--- a/ext/dbx/tests/002.phpt
+++ b/ext/dbx/tests/002.phpt
@@ -2,8 +2,6 @@
 DBX_CONSTANTS
 --SKIPIF--
 <?php if (!extension_loaded("dbx")) print("skip"); ?>
---POST--
---GET--
 --FILE--
 <?php 
 if (DBX_MYSQL=="DBX_MYSQL")               print('!DBX_MYSQL');

diff --git a/ext/dbx/tests/003.phpt b/ext/dbx/tests/003.phpt
index fd0463f04e5c11f1b9b44c46257bd949c27953bb..76fda4caf27aea2518b1171c08a01e192802b4bc 100644 (file)
--- a/ext/dbx/tests/003.phpt
+++ b/ext/dbx/tests/003.phpt
@@ -2,14 +2,8 @@
 dbx_connect
 --SKIPIF--
 <?php 
-    if (!extension_loaded("dbx")) print("skip"); 
-    else {
-        include_once("dbx_test.p");
-        if ($connection===NULL) print("skip");
-        }
+include_once("skipif.inc");
 ?>
---POST--
---GET--
 --FILE--
 <?php 
 include_once("dbx_test.p");

diff --git a/ext/dbx/tests/004.phpt b/ext/dbx/tests/004.phpt
index 87f3e185e7f2cd806fbc02f6731cfb5b2f811bc2..404e7de3eb45f19903942121622f8befe2af8eee 100644 (file)
--- a/ext/dbx/tests/004.phpt
+++ b/ext/dbx/tests/004.phpt
@@ -2,14 +2,8 @@
 dbx_close
 --SKIPIF--
 <?php 
-    if (!extension_loaded("dbx")) print("skip"); 
-    else {
-        include_once("dbx_test.p");
-        if ($connection===NULL) print("skip");
-        }
+include_once("skipif.inc");
 ?>
---POST--
---GET--
 --FILE--
 <?php 
 include_once("dbx_test.p");

diff --git a/ext/dbx/tests/005.phpt b/ext/dbx/tests/005.phpt
index 993d9a9adabbeda1e06498ecbaab6c1ebad130df..beb7fb7931923fc9e8bd45aef471f5c9db0216d9 100644 (file)
--- a/ext/dbx/tests/005.phpt
+++ b/ext/dbx/tests/005.phpt
@@ -2,14 +2,8 @@
 dbx_query
 --SKIPIF--
 <?php 
-    if (!extension_loaded("dbx")) print("skip"); 
-    else {
-        include_once("dbx_test.p");
-        if ($connection===NULL) print("skip");
-        }
+include_once("skipif.inc");
 ?>
---POST--
---GET--
 --FILE--
 <?php 
 include_once("dbx_test.p");

diff --git a/ext/dbx/tests/006.phpt b/ext/dbx/tests/006.phpt
index 4d3f35310ffa83b8a9ce55e7f95fb6f379111d35..13b8b677f7752750caf5eb37caeb1ceda1a08ea0 100644 (file)
--- a/ext/dbx/tests/006.phpt
+++ b/ext/dbx/tests/006.phpt
@@ -2,14 +2,8 @@
 dbx_error
 --SKIPIF--
 <?php 
-    if (!extension_loaded("dbx")) print("skip"); 
-    else {
-        include_once("dbx_test.p");
-        if ($connection===NULL) print("skip");
-        }
+include_once("skipif.inc");
 ?>
---POST--
---GET--
 --FILE--
 <?php 
 include_once("dbx_test.p");

diff --git a/ext/dbx/tests/007.phpt b/ext/dbx/tests/007.phpt
index 534a792b87ab6328901308b4aa48e58d7a5378e1..cc049782f7a643ede3d4abe14f6d72331bc237ac 100644 (file)
--- a/ext/dbx/tests/007.phpt
+++ b/ext/dbx/tests/007.phpt
@@ -2,14 +2,8 @@
 dbx_sort
 --SKIPIF--
 <?php 
-    if (!extension_loaded("dbx")) print("skip"); 
-    else {
-        include_once("dbx_test.p");
-        if ($connection===NULL) print("skip");
-        }
+include_once("skipif.inc");
 ?>
---POST--
---GET--
 --FILE--
 <?php 
 include_once("dbx_test.p");

diff --git a/ext/dbx/tests/008.phpt b/ext/dbx/tests/008.phpt
index 8553671f20e2ed91911dc6096c436d7155dc4fd6..92533bba524337babed3a5d5196fe0da4eb7ded1 100644 (file)
--- a/ext/dbx/tests/008.phpt
+++ b/ext/dbx/tests/008.phpt
@@ -2,14 +2,8 @@
 dbx_compare
 --SKIPIF--
 <?php 
-    if (!extension_loaded("dbx")) print("skip"); 
-    else {
-        include_once("dbx_test.p");
-        if ($connection===NULL) print("skip");
-        }
+include_once("skipif.inc");
 ?>
---POST--
---GET--
 --FILE--
 <?php 
 include_once("dbx_test.p");

diff --git a/ext/dbx/tests/skipif.inc b/ext/dbx/tests/skipif.inc
new file mode 100644 (file)
index 0000000..d4f6233
--- /dev/null
+++ b/ext/dbx/tests/skipif.inc
@@ -0,0 +1,5 @@
+<?php
+    if (!extension_loaded("dbx")) die("skip"); 
+    include_once("dbx_test.p");
+    if ($connection===NULL) die("skip connection not specified");
+?>
\ No newline at end of file