From cb330eb5d7a9658dec7cc16830de21aa1cb54e2d Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Thu, 24 Oct 2002 19:34:18 +0000
Subject: [PATCH] -specify reason if connection is not specified -remove
 unnecessary sections

---
 ext/dbx/tests/001.phpt   | 2 --
 ext/dbx/tests/002.phpt   | 2 --
 ext/dbx/tests/003.phpt   | 8 +-------
 ext/dbx/tests/004.phpt   | 8 +-------
 ext/dbx/tests/005.phpt   | 8 +-------
 ext/dbx/tests/006.phpt   | 8 +-------
 ext/dbx/tests/007.phpt   | 8 +-------
 ext/dbx/tests/008.phpt   | 8 +-------
 ext/dbx/tests/skipif.inc | 5 +++++
 9 files changed, 11 insertions(+), 46 deletions(-)
 create mode 100644 ext/dbx/tests/skipif.inc

diff --git a/ext/dbx/tests/001.phpt b/ext/dbx/tests/001.phpt
index 2281426230..e8f30f7c1a 100644
--- 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 f9dff86155..391a3fa688 100644
--- 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 fd0463f04e..76fda4caf2 100644
--- 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 87f3e185e7..404e7de3eb 100644
--- 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 993d9a9ada..beb7fb7931 100644
--- 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 4d3f35310f..13b8b677f7 100644
--- 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 534a792b87..cc049782f7 100644
--- 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 8553671f20..92533bba52 100644
--- 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
index 0000000000..d4f6233389
--- /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
-- 
2.50.1