- Allow to load multipe extensions via -d

diff --git a/run-tests.php b/run-tests.php
index 3d1657cbcdca11dd7f58539e91dc7d9bc08971db..56ec387fb76ed59eed43fe537208d5f7905ef0bd 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -1748,7 +1748,14 @@ function settings2array($settings, &$ini_settings)
                        $setting = explode("=", $setting, 2);
                        $name = trim(strtolower($setting[0]));
                        $value = trim($setting[1]);
-                       $ini_settings[$name] = $value;
+                       if ($name == 'extension') {
+                               if (!isset($ini_settings[$name])) {
+                                       $ini_settings[$name] = array();
+                               }
+                               $ini_settings[$name][] = $value;
+                       } else {
+                               $ini_settings[$name] = $value;
+                       }
                }
        }
 }
@@ -1757,8 +1764,15 @@ function settings2params(&$ini_settings)
 {
        $settings = '';
        foreach($ini_settings as $name => $value) {
-               $value = addslashes($value);
-               $settings .= " -d \"$name=$value\"";
+               if (is_array($value)) {
+                       foreach($value as $val) {
+                               $val = addslashes($val);
+                               $settings .= " -d \"$name=$val\"";
+                       }
+               } else {
+                       $value = addslashes($value);
+                       $settings .= " -d \"$name=$value\"";
+               }
        }
        $ini_settings = $settings;
 }