restructured error output in unittests. (issues #52 + #54)

19 files changed, 21 insertions, 18 deletions

diff --git a/tests/sql/mysqli_comment_conditional.phpt b/tests/sql/mysqli_comment_conditional.phpt
index 0436c64..02366c0 100644
--- a/tests/sql/mysqli_comment_conditional.phpt
+++ b/tests/sql/mysqli_comment_conditional.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_comment_cstyle_fail.phpt b/tests/sql/mysqli_comment_cstyle_fail.phpt
index 56a8ccb..5a4c5e7 100644
--- a/tests/sql/mysqli_comment_cstyle_fail.phpt
+++ b/tests/sql/mysqli_comment_cstyle_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_comment_hashstyle_fail.phpt b/tests/sql/mysqli_comment_hashstyle_fail.phpt
index 6f5b517..c67cf44 100644
--- a/tests/sql/mysqli_comment_hashstyle_fail.phpt
+++ b/tests/sql/mysqli_comment_hashstyle_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_comment_sqlstyle.phpt b/tests/sql/mysqli_comment_sqlstyle.phpt
index c32c76a..d0e454e 100644
--- a/tests/sql/mysqli_comment_sqlstyle.phpt
+++ b/tests/sql/mysqli_comment_sqlstyle.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_comment_sqlstyle_fail.phpt b/tests/sql/mysqli_comment_sqlstyle_fail.phpt
index 83e63c5..9894d96 100644
--- a/tests/sql/mysqli_comment_sqlstyle_fail.phpt
+++ b/tests/sql/mysqli_comment_sqlstyle_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_connect_invalid_username.phpt b/tests/sql/mysqli_connect_invalid_username.phpt
index 532254f..c83bf1e 100644
--- a/tests/sql/mysqli_connect_invalid_username.phpt
+++ b/tests/sql/mysqli_connect_invalid_username.phpt
@@ -6,7 +6,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_multiselect.phpt b/tests/sql/mysqli_multiselect.phpt
index 63d6c19..2595441 100644
--- a/tests/sql/mysqli_multiselect.phpt
+++ b/tests/sql/mysqli_multiselect.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_multiselect_fail.phpt b/tests/sql/mysqli_multiselect_fail.phpt
index 2bee62a..9f4216f 100644
--- a/tests/sql/mysqli_multiselect_fail.phpt
+++ b/tests/sql/mysqli_multiselect_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_multiselect_subselect.phpt b/tests/sql/mysqli_multiselect_subselect.phpt
index e629720..6308cfa 100644
--- a/tests/sql/mysqli_multiselect_subselect.phpt
+++ b/tests/sql/mysqli_multiselect_subselect.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_no_constraints.phpt b/tests/sql/mysqli_no_constraints.phpt
index 1d7fff6..1ba2875 100644
--- a/tests/sql/mysqli_no_constraints.phpt
+++ b/tests/sql/mysqli_no_constraints.phpt
@@ -11,7 +11,7 @@ suhosin.sql.union=0
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_open_comment.phpt b/tests/sql/mysqli_open_comment.phpt
index 29d3536..e65ebd5 100644
--- a/tests/sql/mysqli_open_comment.phpt
+++ b/tests/sql/mysqli_open_comment.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_open_comment_fail.phpt b/tests/sql/mysqli_open_comment_fail.phpt
index 4645523..a898153 100644
--- a/tests/sql/mysqli_open_comment_fail.phpt
+++ b/tests/sql/mysqli_open_comment_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_union.phpt b/tests/sql/mysqli_union.phpt
index 9af9c61..77eb8e4 100644
--- a/tests/sql/mysqli_union.phpt
+++ b/tests/sql/mysqli_union.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_union_fail.phpt b/tests/sql/mysqli_union_fail.phpt
index ee51a79..ddcfd0e 100644
--- a/tests/sql/mysqli_union_fail.phpt
+++ b/tests/sql/mysqli_union_fail.phpt
@@ -11,7 +11,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_user_match_error.phpt b/tests/sql/mysqli_user_match_error.phpt
index 69db081..a8d1068 100644
--- a/tests/sql/mysqli_user_match_error.phpt
+++ b/tests/sql/mysqli_user_match_error.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_user_match_ok.phpt b/tests/sql/mysqli_user_match_ok.phpt
index a2ad832..a1365ed 100644
--- a/tests/sql/mysqli_user_match_ok.phpt
+++ b/tests/sql/mysqli_user_match_ok.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_user_postfix.phpt b/tests/sql/mysqli_user_postfix.phpt
index 11e3fe6..90be13f 100644
--- a/tests/sql/mysqli_user_postfix.phpt
+++ b/tests/sql/mysqli_user_postfix.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/mysqli_user_prefix.phpt b/tests/sql/mysqli_user_prefix.phpt
index bb229f0..5ec793f 100644
--- a/tests/sql/mysqli_user_prefix.phpt
+++ b/tests/sql/mysqli_user_prefix.phpt
@@ -7,7 +7,7 @@ suhosin.log.stdout=32
 --SKIPIF--
 <?php
 include('skipifmysqli.inc');
-include('skipif.inc');
+include('../skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/tests/sql/skipifmysqli.inc b/tests/sql/skipifmysqli.inc
index ee16cf1..99c235d 100644
--- a/tests/sql/skipifmysqli.inc
+++ b/tests/sql/skipifmysqli.inc
@@ -2,4 +2,7 @@
 if (!extension_loaded("mysqli")) {
         die('skip - mysqli extension not available');
 }
+if (!getenv("TEST_SUHOSIN_MYSQL")) {
+    die("skip TEST_SUHOSIN_MYSQL is not set");
+}
 ?>
\ No newline at end of file