Revert "track tests skipped by ext separately"

This reverts commit 24cb772.

Author: mvorisek

run-tests.php

@@ -69,7 +69,7 @@ function show_usage(): void
                 with value 'bar').
 
     -g          Comma separated list of groups to show during test run
-                (possible values: PASS, FAIL, XFAIL, XLEAK, SKIP, SKIP_EXT, BORK, WARN, LEAK, REDIRECT).
+                (possible values: PASS, FAIL, XFAIL, XLEAK, SKIP, BORK, WARN, LEAK, REDIRECT).
 
     -m          Test for memory leaks with Valgrind (equivalent to -M memcheck).
 
@@ -1768,18 +1768,6 @@ function skip_test(string $tested, string $tested_file, string $shortname, strin
     return 'SKIPPED';
 }
 
-function skip_ext_test(string $tested, string $tested_file, string $shortname, array $missing_exts) {
-    global $junit;
-
-    $reason = 'Required extension' . (count($missing_exts) > 1 ? 's' : '')
-        . ' missing: ' . implode(', ', $missing_exts);
-
-    show_result('SKIP_EXT', $tested, $tested_file, "reason: $reason");
-    $junit->initSuite($junit->getSuiteName($shortname));
-    $junit->markTestAs('SKIP_EXT', $shortname, $tested, 0, $reason);
-    return 'SKIPPED_EXT';
-}
-
 //
 //  Run an individual test case.
 //
@@ -2049,7 +2037,9 @@ function run_test(string $php, $file, array $env): string
             }
         }
         if ($missing) {
-            return skip_ext_test($tested, $tested_file, $shortname, $missing);
+            $message = 'Required extension' . (count($missing) > 1 ? 's' : '')
+                . ' missing: ' . implode(', ', $missing);
+            return skip_test($tested, $tested_file, $shortname, $message);
         }
     }
 
@@ -3041,7 +3031,6 @@ function compute_summary(): void
         'PASSED' => 0,
         'WARNED' => 0,
         'SKIPPED' => 0,
-        'SKIPPED_EXT' => 0,
         'FAILED' => 0,
         'BORKED' => 0,
         'LEAKED' => 0,
@@ -3064,7 +3053,7 @@ function get_summary(bool $show_ext_summary): string
 {
     global $n_total, $sum_results, $percent_results, $end_time, $start_time, $failed_test_summary, $PHP_FAILED_TESTS, $valgrind;
 
-    $x_total = $n_total - $sum_results['SKIPPED'] - $sum_results['SKIPPED_EXT'] - $sum_results['BORKED'];
+    $x_total = $n_total - $sum_results['SKIPPED'] - $sum_results['BORKED'];
 
     if ($x_total) {
         $x_warned = (100.0 * $sum_results['WARNED']) / $x_total;
@@ -3088,37 +3077,36 @@ function get_summary(bool $show_ext_summary): string
     }
 
     $summary .=
-'Number of tests     : ' . sprintf('%4d', $n_total) . '          ' . sprintf('%8d', $x_total);
+'Number of tests : ' . sprintf('%4d', $n_total) . '          ' . sprintf('%8d', $x_total);
 
     if ($sum_results['BORKED']) {
         $summary .= '
-Tests borked        : ' . sprintf('%4d (%5.1f%%)', $sum_results['BORKED'], $percent_results['BORKED']) . ' --------';
+Tests borked    : ' . sprintf('%4d (%5.1f%%)', $sum_results['BORKED'], $percent_results['BORKED']) . ' --------';
     }
 
     $summary .= '
-Tests skipped by ext: ' . sprintf('%4d (%5.1f%%)', $sum_results['SKIPPED_EXT'], $percent_results['SKIPPED_EXT']) . ' --------
-Tests skipped other : ' . sprintf('%4d (%5.1f%%)', $sum_results['SKIPPED'], $percent_results['SKIPPED']) . ' --------
-Tests warned        : ' . sprintf('%4d (%5.1f%%)', $sum_results['WARNED'], $percent_results['WARNED']) . ' ' . sprintf('(%5.1f%%)', $x_warned) . '
-Tests failed        : ' . sprintf('%4d (%5.1f%%)', $sum_results['FAILED'], $percent_results['FAILED']) . ' ' . sprintf('(%5.1f%%)', $x_failed);
+Tests skipped   : ' . sprintf('%4d (%5.1f%%)', $sum_results['SKIPPED'], $percent_results['SKIPPED']) . ' --------
+Tests warned    : ' . sprintf('%4d (%5.1f%%)', $sum_results['WARNED'], $percent_results['WARNED']) . ' ' . sprintf('(%5.1f%%)', $x_warned) . '
+Tests failed    : ' . sprintf('%4d (%5.1f%%)', $sum_results['FAILED'], $percent_results['FAILED']) . ' ' . sprintf('(%5.1f%%)', $x_failed);
 
     if ($sum_results['XFAILED']) {
         $summary .= '
-Expected fail       : ' . sprintf('%4d (%5.1f%%)', $sum_results['XFAILED'], $percent_results['XFAILED']) . ' ' . sprintf('(%5.1f%%)', $x_xfailed);
+Expected fail   : ' . sprintf('%4d (%5.1f%%)', $sum_results['XFAILED'], $percent_results['XFAILED']) . ' ' . sprintf('(%5.1f%%)', $x_xfailed);
     }
 
     if ($valgrind) {
         $summary .= '
-Tests leaked        : ' . sprintf('%4d (%5.1f%%)', $sum_results['LEAKED'], $percent_results['LEAKED']) . ' ' . sprintf('(%5.1f%%)', $x_leaked);
+Tests leaked    : ' . sprintf('%4d (%5.1f%%)', $sum_results['LEAKED'], $percent_results['LEAKED']) . ' ' . sprintf('(%5.1f%%)', $x_leaked);
         if ($sum_results['XLEAKED']) {
             $summary .= '
-Expected leak       : ' . sprintf('%4d (%5.1f%%)', $sum_results['XLEAKED'], $percent_results['XLEAKED']) . ' ' . sprintf('(%5.1f%%)', $x_xleaked);
+Expected leak   : ' . sprintf('%4d (%5.1f%%)', $sum_results['XLEAKED'], $percent_results['XLEAKED']) . ' ' . sprintf('(%5.1f%%)', $x_xleaked);
         }
     }
 
     $summary .= '
-Tests passed        : ' . sprintf('%4d (%5.1f%%)', $sum_results['PASSED'], $percent_results['PASSED']) . ' ' . sprintf('(%5.1f%%)', $x_passed) . '
+Tests passed    : ' . sprintf('%4d (%5.1f%%)', $sum_results['PASSED'], $percent_results['PASSED']) . ' ' . sprintf('(%5.1f%%)', $x_passed) . '
 ---------------------------------------------------------------------
-Time taken          : ' . sprintf('%4d seconds', $end_time - $start_time) . '
+Time taken      : ' . sprintf('%4d seconds', $end_time - $start_time) . '
 =====================================================================
 ';
     $failed_test_summary = '';
@@ -3339,7 +3327,6 @@ class JUnit
         'test_fail' => 0,
         'test_error' => 0,
         'test_skip' => 0,
-        'test_skip_ext' => 0,
         'test_warn' => 0,
         'files' => [],
         'execution_time' => 0,
@@ -3380,13 +3367,12 @@ public function saveXML(): void
 
         $xml = '<' . '?' . 'xml version="1.0" encoding="UTF-8"' . '?' . '>' . PHP_EOL;
         $xml .= sprintf(
-            '<testsuites name="%s" tests="%s" failures="%d" errors="%d" skip="%d" skip_ext="%d" time="%s">' . PHP_EOL,
+            '<testsuites name="%s" tests="%s" failures="%d" errors="%d" skip="%d" time="%s">' . PHP_EOL,
             $this->rootSuite['name'],
             $this->rootSuite['test_total'],
             $this->rootSuite['test_fail'],
             $this->rootSuite['test_error'],
             $this->rootSuite['test_skip'],
-            $this->rootSuite['test_skip_ext'],
             $this->rootSuite['execution_time']
         );
         $xml .= $this->getSuitesXML();
@@ -3401,13 +3387,12 @@ private function getSuitesXML(string $suite_name = '')
 
         foreach ($this->suites as $suite_name => $suite) {
             $result .= sprintf(
-                '<testsuite name="%s" tests="%s" failures="%d" errors="%d" skip="%d" skip_ext="%d" time="%s">' . PHP_EOL,
+                '<testsuite name="%s" tests="%s" failures="%d" errors="%d" skip="%d" time="%s">' . PHP_EOL,
                 $suite['name'],
                 $suite['test_total'],
                 $suite['test_fail'],
                 $suite['test_error'],
                 $suite['test_skip'],
-                $suite['test_skip_ext'],
                 $suite['execution_time']
             );
 
@@ -3467,9 +3452,6 @@ public function markTestAs(
         } elseif ('SKIP' == $type) {
             $this->record($suite, 'test_skip');
             $this->rootSuite['files'][$file_name]['xml'] .= "<skipped>$escaped_message</skipped>\n";
-        } elseif ('SKIP_EXP' == $type) {
-            $this->record($suite, 'test_skip_ext');
-            $this->rootSuite['files'][$file_name]['xml'] .= "<skipped_ext>$escaped_message</skipped_ext>\n";
         } elseif ('WARN' == $type) {
             $this->record($suite, 'test_warn');
             $this->rootSuite['files'][$file_name]['xml'] .= "<warning>$escaped_message</warning>\n";
@@ -3616,7 +3598,6 @@ private function mergeSuites(array &$dest, array $source): void
         $dest['test_fail']  += $source['test_fail'];
         $dest['test_error'] += $source['test_error'];
         $dest['test_skip']  += $source['test_skip'];
-        $dest['test_skip_ext']  += $source['test_skip_ext'];
         $dest['test_warn']  += $source['test_warn'];
         $dest['execution_time'] += $source['execution_time'];
         $dest['files'] += $source['files'];