Rearrange db tests

2012-04-10 22:10:33 -04:00 · 2012-04-10 22:10:33 -04:00 · db47f15fdd
parent c4a99aee9a
commit db47f15fdd
12 changed files with 2 additions and 4 deletions
--- a/tests/databases/firebird/firebird-qb.php
+++ b/tests/databases/firebird/firebird-qb.php
--- a/tests/databases/firebird/firebird.php
+++ b/tests/databases/firebird/firebird.php
--- a/tests/databases/mysql/mysql-qb.php
+++ b/tests/databases/mysql/mysql-qb.php
--- a/tests/databases/mysql/mysql.php
+++ b/tests/databases/mysql/mysql.php
--- a/tests/databases/odbc/odbc-qb.php
+++ b/tests/databases/odbc/odbc-qb.php
--- a/tests/databases/odbc/odbc.php
+++ b/tests/databases/odbc/odbc.php
--- a/tests/databases/pgsql/pgsql-qb.php
+++ b/tests/databases/pgsql/pgsql-qb.php
--- a/tests/databases/pgsql/pgsql.php
+++ b/tests/databases/pgsql/pgsql.php
--- a/tests/databases/sqlite/sqlite-qb.php
+++ b/tests/databases/sqlite/sqlite-qb.php
--- a/tests/databases/sqlite/sqlite.php
+++ b/tests/databases/sqlite/sqlite.php
--- a/tests/index.php
+++ b/tests/index.php
@ -59,8 +59,7 @@ foreach(pdo_drivers() as $d)
 	if(is_dir($src_dir))
 	{
 		array_map('do_include', glob($src_path.$d.'/*.php'));
-		require_once("{$test_path}{$d}.php");
-		require_once("{$test_path}{$d}-qb.php");
+		array_map('do_include', glob($test_path.$d.'/*.php'));
 	}
 }

@ -68,6 +67,5 @@ foreach(pdo_drivers() as $d)
 if(function_exists('fbird_connect'))
 {
 	array_map('do_include', glob($src_path.'firebird/*.php'));
-	require_once("{$test_path}firebird.php");
-	require_once("{$test_path}firebird-qb.php");
+	array_map('do_include', glob($test_path.'firebird/*.php'));
 }
--- a/tests/test_dbs/FB_TEST_DB.FDB
+++ b/tests/test_dbs/FB_TEST_DB.FDB