Add individual CONFLICT sections to have parallel testing

Author: Girgias

ext/dba/tests/CONFLICTS

@@ -8,6 +8,8 @@ dba
     if (!function_exists('dba_list')) die('skip dba_list() not available');
     die("info $HND handler used");
 ?>
+--CONFLICTS--
+dba
 --FILE--
 <?php
     require_once(__DIR__ .'/test.inc');

ext/dba/tests/dba007.phpt

@@ -7,6 +7,8 @@ dba
     require_once(__DIR__ .'/skipif.inc');
     print("info $HND handler used");
 ?>
+--CONFLICTS--
+dba
 --FILE--
 <?php
     require_once(__DIR__ .'/test.inc');

ext/dba/tests/dba009.phpt

@@ -8,6 +8,8 @@ $handler = "flatfile";
 require_once(__DIR__ .'/skipif.inc');
 die("info $HND handler used");
 ?>
+--CONFLICTS--
+dba
 --FILE--
 <?php
 

ext/dba/tests/dba015.phpt

@@ -8,6 +8,8 @@ $handler = 'cdb';
 require_once(__DIR__ .'/skipif.inc');
 die('info CDB does not support replace or delete');
 ?>
+--CONFLICTS--
+dba
 --FILE--
 <?php
 

ext/dba/tests/dba_cdb_001.phpt

@@ -2,6 +2,8 @@
 DBA DB4 New File Creation open("c") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_001.phpt

@@ -2,6 +2,8 @@
 DBA DB4 New File Creation open("n") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_002.phpt

@@ -2,6 +2,8 @@
 DBA DB4 File Creation open("c") with existing file
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_003.phpt

@@ -2,6 +2,8 @@
 DBA DB4 Truncate Existing File open("n")
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_004.phpt

@@ -2,6 +2,8 @@
 DBA DB4 New File Creation popen("c") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_005.phpt

@@ -2,6 +2,8 @@
 DBA DB4 New File Creation popen("n") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_006.phpt

@@ -2,6 +2,8 @@
 DBA DB4 File Creation popen("c") with existing invalid file
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_007.phpt

@@ -2,6 +2,8 @@
 DBA DB4 Truncate Existing File popen("n")
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_008.phpt

@@ -4,50 +4,32 @@ DBA DB4 Multiple File Creation Test
 dba
 --SKIPIF--
 <?php
-$handler = "db4";
-require_once(__DIR__ .'/skipif.inc');
-die("info $HND handler used");
+require_once __DIR__ . '/setup/setup_dba_tests.inc';
+check_skip('db4');
 ?>
 --FILE--
 <?php
 $handler = "db4";
-require_once(__DIR__ .'/test.inc');
 echo "database handler: $handler\n";
-$db_file1 = $db_filename1 = __DIR__.'/test1.dbm';
-$db_file2 = $db_filename2 = __DIR__.'/test2.dbm';
-if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
-    echo "database file created\n";
-} else {
-    echo "$db_file does not exist\n";
-}
-if (($db_file1=dba_open($db_file1, "n", $handler))!==FALSE) {
-    echo "database file created\n";
-} else {
-    echo "$db_file does not exist\n";
-}
-if (($db_file2=dba_open($db_file2, "n", $handler))!==FALSE) {
-    echo "database file created\n";
-} else {
-    echo "$db_file does not exist\n";
-}
+$db_file1 = __DIR__.'/test1.dbm';
+$db_file2 = __DIR__.'/test2.dbm';
+$db_file1 = dba_open($db_file1, "n", $handler);
+$db_file2 = dba_open($db_file2, "n", $handler);
 var_dump(dba_list());
-dba_close($db_file);
+dba_close($db_file1);
+dba_close($db_file2);
 
-@unlink($db_filename1);
-@unlink($db_filename2);
 ?>
 --CLEAN--
 <?php
-require(__DIR__ .'/clean.inc');
+$db_filename1 = __DIR__.'/test1.dbm';
+$db_filename2 = __DIR__.'/test2.dbm';
+@unlink($db_filename1);
+@unlink($db_filename2);
 ?>
 --EXPECTF--
 database handler: db4
-database file created
-database file created
-database file created
-array(3) {
-  [%d]=>
-  string(%d) "%stest0.dbm"
+array(2) {
   [%d]=>
   string(%d) "%stest1.dbm"
   [%d]=>

ext/dba/tests/dba_db4_009.phpt

@@ -2,6 +2,8 @@
 DBA DB4 New File Creation open("rl")
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_011.phpt

@@ -2,6 +2,8 @@
 DBA DB4 File open("rl") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_012.phpt

@@ -2,6 +2,8 @@
 DBA DB4 File open("wl") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_013.phpt

@@ -2,6 +2,8 @@
 DBA DB4 File open("wl") & Insert Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_014.phpt

@@ -2,6 +2,8 @@
 DBA DB4 File Creation popen("c") with existing valid file
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_015.phpt

@@ -2,6 +2,8 @@
 DBA DB4 file creation dba_open("cd")
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_016.phpt

@@ -2,6 +2,8 @@
 DBA DB4 with persistent connections
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_017.phpt

@@ -2,6 +2,8 @@
 DBA DB4 Handler Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler="db4";

ext/dba/tests/dba_db4_018.phpt

@@ -2,6 +2,8 @@
 DBA DB4 Optimize Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_handlers.phpt

@@ -2,6 +2,8 @@
 DBA DB4 Sync Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
 $handler = "db4";

ext/dba/tests/dba_db4_optimize.phpt

@@ -2,6 +2,8 @@
 DBA Sync Test
 --EXTENSIONS--
 dba
+--CONFLICTS--
+dba
 --SKIPIF--
 <?php
     require_once __DIR__ .'/skipif.inc';