From 67d08f57052889b8d13813fa93776bc4c4db2ba3 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 26 May 2026 20:10:02 -0400
Subject: [PATCH 01/11] Handle skipped tests in "Not run" column

This commit introduces a new `notRunSkippedDetailsRegex` property to the Project model, allowing users to define regex patterns for not-run test details. A corresponding validation rule is added to ensure the regex is valid. The Build model now includes a method to count not-run tests that do not match the specified patterns, and the GraphQL schema is updated to expose this functionality. Additionally, UI components are modified to display the warning count and adjust test status colors based on the new regex patterns. Tests are also added to verify the new functionality.
---
 .../UpdateProjectInputValidator.php           |   6 +
 app/Models/Build.php                          |  19 +++
 app/Models/Project.php                        |   4 +
 app/Rules/NotRunSkippedDetailsRegexRule.php   |  26 ++++
 app/Utils/TestDisplay.php                     | 142 ++++++++++++++++++
 app/cdash/app/Controller/Api/Index.php        |  14 ++
 app/cdash/app/Controller/Api/QueryTests.php   |   8 +-
 app/cdash/tests/test_testhistory.php          |   3 +
 ...otrun_skipped_details_regex_to_project.php |  15 ++
 graphql/schema.graphql                        |  19 +++
 .../js/angular/views/partials/build.html      |   2 +-
 .../js/vue/components/BuildSummaryPage.vue    |   9 +-
 .../js/vue/components/BuildTestsPage.vue      |  33 ++--
 .../components/ProjectSettings/GeneralTab.vue |  13 +-
 .../js/vue/components/ProjectSettingsPage.vue |  17 +++
 resources/js/vue/components/TestIdPage.vue    |  16 ++
 .../js/vue/components/shared/FormSection.vue  |  11 +-
 .../js/vue/components/shared/TestDisplay.js   |  99 ++++++++++++
 tests/Browser/Pages/BuildTestsPageTest.php    |  46 ++++++
 tests/Feature/GraphQL/BuildTypeTest.php       |  54 +++++++
 .../GraphQL/Mutations/UpdateProjectTest.php   |  26 ++++
 tests/Feature/GraphQL/ProjectTypeTest.php     |   2 +
 tests/Unit/Utils/TestDisplayTest.php          |  82 ++++++++++
 23 files changed, 644 insertions(+), 22 deletions(-)
 create mode 100644 app/Rules/NotRunSkippedDetailsRegexRule.php
 create mode 100644 app/Utils/TestDisplay.php
 create mode 100644 database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php
 create mode 100644 resources/js/vue/components/shared/TestDisplay.js
 create mode 100644 tests/Unit/Utils/TestDisplayTest.php

diff --git a/app/GraphQL/Validators/UpdateProjectInputValidator.php b/app/GraphQL/Validators/UpdateProjectInputValidator.php
index 0dc314ed3a..9d176a6436 100644
--- a/app/GraphQL/Validators/UpdateProjectInputValidator.php
+++ b/app/GraphQL/Validators/UpdateProjectInputValidator.php
@@ -3,6 +3,7 @@
 namespace App\GraphQL\Validators;
 
 use App\Models\Project;
+use App\Rules\NotRunSkippedDetailsRegexRule;
 use App\Rules\ProjectAuthenticateSubmissionsRule;
 use App\Rules\ProjectNameRule;
 use App\Rules\ProjectVisibilityRule;
@@ -25,6 +26,11 @@ public function rules(): array
             'authenticateSubmissions' => [
                 new ProjectAuthenticateSubmissionsRule(),
             ],
+            'notRunSkippedDetailsRegex' => [
+                'nullable',
+                'string',
+                new NotRunSkippedDetailsRegexRule(),
+            ],
         ];
     }
 
diff --git a/app/Models/Build.php b/app/Models/Build.php
index a0d8fe0185..98402a0684 100644
--- a/app/Models/Build.php
+++ b/app/Models/Build.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Utils\TestDisplay;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -400,4 +401,22 @@ public function percentCoverageForPath(string $path): ?float
 
         return ($loctested / $total_lines) * 100;
     }
+
+    /**
+     * The number of not-run tests whose details do not match the project's skipped pattern.
+     */
+    public function notRunTestsWarningCount(): int
+    {
+        $patterns = $this->project?->notrun_skipped_details_regex
+            ?? TestDisplay::DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX;
+
+        $count = 0;
+        foreach ($this->tests()->where('status', Test::NOTRUN)->pluck('details') as $details) {
+            if (!TestDisplay::isAcceptableNotRun($details, $patterns)) {
+                $count++;
+            }
+        }
+
+        return $count;
+    }
 }
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 11b7987ed4..c102b9200e 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\ProjectRole;
+use App\Utils\TestDisplay;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -49,6 +50,7 @@
  * @property ?string $banner
  * @property ?string $logoUrl
  * @property ?string $cmakeprojectroot
+ * @property string $notrun_skipped_details_regex
  *
  * @method Builder<Project> forUser()
  * @method Builder<Project> administeredByUser()
@@ -95,6 +97,7 @@ class Project extends Model
         'ldapfilter',
         'banner',
         'cmakeprojectroot',
+        'notrun_skipped_details_regex',
     ];
 
     protected $casts = [
@@ -137,6 +140,7 @@ class Project extends Model
         'uploadquota' => 10,
         'showcoveragecode' => true,
         'authenticatesubmissions' => false,
+        'notrun_skipped_details_regex' => TestDisplay::DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX,
     ];
 
     public const ACCESS_PRIVATE = 0;
diff --git a/app/Rules/NotRunSkippedDetailsRegexRule.php b/app/Rules/NotRunSkippedDetailsRegexRule.php
new file mode 100644
index 0000000000..d6d9c402dd
--- /dev/null
+++ b/app/Rules/NotRunSkippedDetailsRegexRule.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Rules;
+
+use App\Utils\TestDisplay;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+final class NotRunSkippedDetailsRegexRule implements ValidationRule
+{
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if ($value === null || $value === '') {
+            return;
+        }
+
+        if (!is_string($value)) {
+            $fail('The skipped test details pattern must be a string.');
+            return;
+        }
+
+        if (!TestDisplay::isValidPatternsText($value)) {
+            $fail('The skipped test details pattern contains an invalid regular expression.');
+        }
+    }
+}
diff --git a/app/Utils/TestDisplay.php b/app/Utils/TestDisplay.php
new file mode 100644
index 0000000000..a4e67670c7
--- /dev/null
+++ b/app/Utils/TestDisplay.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Utils;
+
+use App\Models\Test;
+
+final class TestDisplay
+{
+    public const DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX = '*skip*';
+
+    /**
+     * @return list<string>
+     */
+    public static function parsePatterns(?string $patternsText): array
+    {
+        if ($patternsText === null || trim($patternsText) === '') {
+            return [];
+        }
+
+        $patterns = [];
+        foreach (preg_split("/\r\n|\n|\r/", $patternsText) as $line) {
+            $line = trim($line);
+            if ($line !== '') {
+                $patterns[] = $line;
+            }
+        }
+
+        return $patterns;
+    }
+
+    public static function patternToPcre(string $pattern): string
+    {
+        $pattern = trim($pattern);
+        if ($pattern === '') {
+            return '';
+        }
+
+        if (str_starts_with($pattern, '/')) {
+            return $pattern;
+        }
+
+        $parts = preg_split('/(\*|\?)/', $pattern, -1, PREG_SPLIT_DELIM_CAPTURE);
+        if ($parts === false) {
+            return '';
+        }
+
+        $regex = '';
+        foreach ($parts as $part) {
+            if ($part === '*') {
+                $regex .= '.*';
+            } elseif ($part === '?') {
+                $regex .= '.';
+            } else {
+                $regex .= preg_quote($part, '/');
+            }
+        }
+
+        return '/(?i)' . $regex . '/';
+    }
+
+    public static function detailsMatchesSkippedPattern(?string $details, ?string $patternsText): bool
+    {
+        if ($details === null || $details === '') {
+            return false;
+        }
+
+        foreach (self::parsePatterns($patternsText) as $pattern) {
+            $pcre = self::patternToPcre($pattern);
+            if ($pcre === '') {
+                continue;
+            }
+
+            $result = @preg_match($pcre, $details);
+            if ($result === 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function isAcceptableNotRun(?string $details, ?string $patternsText): bool
+    {
+        return self::detailsMatchesSkippedPattern($details, $patternsText);
+    }
+
+    public static function statusColorClass(string $status, ?string $details, ?string $patternsText): string
+    {
+        if ($status === Test::NOTRUN && self::isAcceptableNotRun($details, $patternsText)) {
+            return 'normal';
+        }
+
+        return match ($status) {
+            Test::PASSED => 'normal',
+            Test::FAILED => 'error',
+            Test::NOTRUN => 'warning',
+            default => '',
+        };
+    }
+
+    public static function statusTextColorClass(string $status, ?string $details, ?string $patternsText): string
+    {
+        return match (self::statusColorClass($status, $details, $patternsText)) {
+            'normal' => 'normal-text',
+            'warning' => 'warning-text',
+            'error' => 'error-text',
+            default => '',
+        };
+    }
+
+    public static function graphqlStatusColorClass(string $status, ?string $details, ?string $patternsText): string
+    {
+        $dbStatus = match ($status) {
+            'NOT_RUN' => Test::NOTRUN,
+            'PASSED' => Test::PASSED,
+            'FAILED' => Test::FAILED,
+            default => strtolower($status),
+        };
+
+        return self::statusColorClass($dbStatus, $details, $patternsText);
+    }
+
+    public static function isValidPatternsText(?string $patternsText): bool
+    {
+        foreach (self::parsePatterns($patternsText) as $pattern) {
+            $pcre = self::patternToPcre($pattern);
+            if ($pcre === '') {
+                return false;
+            }
+
+            set_error_handler(static fn (): bool => true);
+            $result = preg_match($pcre, '');
+            restore_error_handler();
+
+            if ($result === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/app/cdash/app/Controller/Api/Index.php b/app/cdash/app/Controller/Api/Index.php
index b70f94fd90..7542f771bf 100644
--- a/app/cdash/app/Controller/Api/Index.php
+++ b/app/cdash/app/Controller/Api/Index.php
@@ -17,6 +17,7 @@
 
 namespace CDash\Controller\Api;
 
+use App\Models\Build as EloquentBuild;
 use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\BuildGroup;
@@ -1098,6 +1099,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
             }
 
             $test_response['notrun'] = $nnotrun;
+            $test_response['notrunwarning'] = $this->computeNotRunTestsWarningCount((int) $buildid, $nnotrun);
             $test_response['fail'] = $nfail;
             $test_response['pass'] = $npass;
 
@@ -1555,4 +1557,16 @@ public function recordGenerationTime(array &$response): void
     {
         $this->pageTimer->end($response);
     }
+
+    /**
+     * Count not-run tests that should display as warnings on the index page.
+     */
+    private function computeNotRunTestsWarningCount(int $buildid, int $notRunCount): int
+    {
+        if ($notRunCount <= 0) {
+            return 0;
+        }
+
+        return EloquentBuild::find($buildid)?->notRunTestsWarningCount() ?? 0;
+    }
 }
diff --git a/app/cdash/app/Controller/Api/QueryTests.php b/app/cdash/app/Controller/Api/QueryTests.php
index 7f00f75295..0899abe869 100644
--- a/app/cdash/app/Controller/Api/QueryTests.php
+++ b/app/cdash/app/Controller/Api/QueryTests.php
@@ -20,6 +20,7 @@
 use App\Models\PinnedTestMeasurement;
 use App\Models\Project as EloquentProject;
 use App\Models\TestMeasurement;
+use App\Utils\TestDisplay;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\Project;
@@ -375,6 +376,7 @@ public function getResponse(): array
                 ", $query_params);
 
         // Rows of test data to be displayed to the user.
+        $notRunSkippedDetailsRegex = EloquentProject::findOrFail($this->project->Id)->notrun_skipped_details_regex;
         $tests = [];
         foreach ($rows as $row) {
             $test = [];
@@ -423,7 +425,11 @@ public function getResponse(): array
 
                 case 'notrun':
                     $test['status'] = 'Not Run';
-                    $test['statusclass'] = 'warning';
+                    $test['statusclass'] = TestDisplay::statusColorClass(
+                        'notrun',
+                        $row->details,
+                        $notRunSkippedDetailsRegex,
+                    );
                     break;
             }
 
diff --git a/app/cdash/tests/test_testhistory.php b/app/cdash/tests/test_testhistory.php
index 7f06fb55fc..e9bd2f3a24 100644
--- a/app/cdash/tests/test_testhistory.php
+++ b/app/cdash/tests/test_testhistory.php
@@ -134,6 +134,9 @@ private function generateXML($mm, $timestamp, $include_sporadic, $flaky_passed)
                   <FullName>./notrun</FullName>
                   <FullCommandLine></FullCommandLine>
                   <Results>
+                    <NamedMeasurement type="text/string" name="Exit Code">
+                      <Value>Skipped</Value>
+                    </NamedMeasurement>
                     <NamedMeasurement type="text/string" name="Command Line">
                       <Value></Value>
                     </NamedMeasurement>
diff --git a/database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php b/database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php
new file mode 100644
index 0000000000..e2a61e4547
--- /dev/null
+++ b/database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        DB::statement("ALTER TABLE project ADD COLUMN notrun_skipped_details_regex text NOT NULL DEFAULT '*skip*'");
+    }
+
+    public function down(): void
+    {
+    }
+};
diff --git a/graphql/schema.graphql b/graphql/schema.graphql
index 1eab0ea949..ba63fd858d 100644
--- a/graphql/schema.graphql
+++ b/graphql/schema.graphql
@@ -398,6 +398,13 @@ type Project {
   "Invitations to this project which have not been accepted yet."
   invitations: [ProjectInvitation!]! @canRoot(ability: "inviteUser") @hasMany(type: CONNECTION) @orderBy(column: "id")
 
+  """
+  Regular expression(s), one per line, matched against not-run test details. Matching tests are
+  displayed in green instead of yellow. Glob wildcards (*) are supported. The default pattern is
+  *skip* (case insensitive).
+  """
+  notRunSkippedDetailsRegex: String! @rename(attribute: "notrun_skipped_details_regex")
+
   """
   Pinned test measurements are test measurements, identified by name, which should be shown
   alongside Test details throughout the site.
@@ -515,6 +522,12 @@ input UpdateProjectInput @validator {
   showCoverageCode: Boolean @rename(attribute: "showcoveragecode")
 
   banner: String
+
+  """
+  Regular expression(s), one per line, matched against not-run test details. Matching tests are
+  displayed in green instead of yellow.
+  """
+  notRunSkippedDetailsRegex: String @rename(attribute: "notrun_skipped_details_regex")
 }
 
 
@@ -856,6 +869,12 @@ type Build {
   "The number of tests not run for this build."
   notRunTestsCount: Int @rename(attribute: "testnotrun")
 
+  """
+  The number of not-run tests counted as warnings (excludes tests whose details match the
+  project's skipped-test pattern).
+  """
+  notRunTestsWarningCount: Int! @method(name: "notRunTestsWarningCount")
+
   "The duration of the test step in seconds."
   testDuration: Int! @rename(attribute: "testduration")
 
diff --git a/resources/js/angular/views/partials/build.html b/resources/js/angular/views/partials/build.html
index 4d7e2de8a4..f3520efcc6 100644
--- a/resources/js/angular/views/partials/build.html
+++ b/resources/js/angular/views/partials/build.html
@@ -325,7 +325,7 @@
   </div>
 </td>
 
-<td ng-if="::buildgroup.hastestdata" align="center" ng-class="::{'warning': build.test.notrun > 0, 'normal': build.test.notrun == 0}">
+<td ng-if="::buildgroup.hastestdata" align="center" ng-class="::{'warning': build.test.notrunwarning > 0, 'normal': build.test.notrunwarning == 0}">
   <div ng-if="::build.hastest"
        ng-class="::{'valuewithsub': build.test.nnotrundiffp > 0 || build.test.nnotrundiffn > 0}">
     <a class="cdash-link" ng-href="{{ 'builds/' + build.id + '/tests?filters=%7B%22all%22%3A%5B%7B%22eq%22%3A%7B%22status%22%3A%22NOT_RUN%22%7D%7D%5D%7D' }}">
diff --git a/resources/js/vue/components/BuildSummaryPage.vue b/resources/js/vue/components/BuildSummaryPage.vue
index 1c93385fdc..082ebb7ad2 100644
--- a/resources/js/vue/components/BuildSummaryPage.vue
+++ b/resources/js/vue/components/BuildSummaryPage.vue
@@ -516,6 +516,7 @@ export default {
             buildWarningsCount
             failedTestsCount
             notRunTestsCount
+            notRunTestsWarningCount
             passedTestsCount
             site {
               id
@@ -540,6 +541,7 @@ export default {
             buildWarningsCount
             failedTestsCount
             notRunTestsCount
+            notRunTestsWarningCount
           }
           nextBuild: build(id: $nextId) @include(if: $hasNext) {
             id
@@ -549,6 +551,7 @@ export default {
             buildWarningsCount
             failedTestsCount
             notRunTestsCount
+            notRunTestsWarningCount
           }
         }
       `,
@@ -577,7 +580,7 @@ export default {
             nerrors: Math.max(0, prev.buildErrorsCount),
             nwarnings: Math.max(0, prev.buildWarningsCount),
             ntestfailed: Math.max(0, prev.failedTestsCount),
-            ntestnotrun: Math.max(0, prev.notRunTestsCount),
+            ntestnotrun: Math.max(0, prev.notRunTestsWarningCount),
           };
         } else {
           this.cdash.previousbuild = null;
@@ -592,7 +595,7 @@ export default {
             nerrors: Math.max(0, next.buildErrorsCount),
             nwarnings: Math.max(0, next.buildWarningsCount),
             ntestfailed: Math.max(0, next.failedTestsCount),
-            ntestnotrun: Math.max(0, next.notRunTestsCount),
+            ntestnotrun: Math.max(0, next.notRunTestsWarningCount),
           };
         } else {
           this.cdash.nextbuild = null;
@@ -617,7 +620,7 @@ export default {
 
         this.cdash.test = {
           nfailed: Math.max(0, build.failedTestsCount),
-          nnotrun: Math.max(0, build.notRunTestsCount),
+          nnotrun: Math.max(0, build.notRunTestsWarningCount),
           npassed: Math.max(0, build.passedTestsCount),
         };
 
diff --git a/resources/js/vue/components/BuildTestsPage.vue b/resources/js/vue/components/BuildTestsPage.vue
index 788c83b846..7422904b7b 100644
--- a/resources/js/vue/components/BuildTestsPage.vue
+++ b/resources/js/vue/components/BuildTestsPage.vue
@@ -73,6 +73,7 @@ import LoadingIndicator from './shared/LoadingIndicator.vue';
 import BuildSummaryCard from './shared/BuildSummaryCard.vue';
 import BuildSidebar from './shared/BuildSidebar.vue';
 import { DateTime } from 'luxon';
+import { testStatusToColorClass } from './shared/TestDisplay';
 
 const TEST_QUERY = gql`
   query(
@@ -82,6 +83,9 @@ const TEST_QUERY = gql`
   ) {
     build(id: $buildid) {
       id
+      project {
+        notRunSkippedDetailsRegex
+      }
       tests(filters: $filters, first: 1000000) {
         edges {
           node {
@@ -205,6 +209,11 @@ export default {
         });
         return tests;
       },
+      result({ data }) {
+        if (data?.build?.project?.notRunSkippedDetailsRegex !== undefined) {
+          this.notRunSkippedDetailsRegex = data.build.project.notRunSkippedDetailsRegex;
+        }
+      },
       variables() {
         return {
           buildid: this.buildId,
@@ -237,6 +246,11 @@ export default {
         });
         return tests;
       },
+      result({ data }) {
+        if (data?.build?.project?.notRunSkippedDetailsRegex !== undefined) {
+          this.notRunSkippedDetailsRegex = data.build.project.notRunSkippedDetailsRegex;
+        }
+      },
       variables() {
         return {
           buildid: this.previousBuildId,
@@ -259,6 +273,7 @@ export default {
   data() {
     return {
       changedFilters: JSON.parse(JSON.stringify(this.initialFilters)),
+      notRunSkippedDetailsRegex: '*skip*',
     };
   },
 
@@ -308,6 +323,7 @@ export default {
     },
 
     formattedTestRows() {
+      const notRunSkippedDetailsRegex = this.notRunSkippedDetailsRegex;
       return this.filteredTests?.map((edge) => {
         return {
           name: {
@@ -325,14 +341,14 @@ export default {
             value: edge.node.status,
             text: this.humanReadableTestStatus(edge.node.status),
             href: `${this.$baseURL}/tests/${edge.node.id}`,
-            classes: [this.testStatusToColorClass(edge.node.status)],
+            classes: [testStatusToColorClass(edge.node.status, edge.node.details, notRunSkippedDetailsRegex)],
           },
           subProject: edge.subProject ?? '',
           timeStatus: {
             value: edge.node.timeStatusCategory,
             text: this.humanReadableTestStatus(edge.node.timeStatusCategory),
             href: `${this.$baseURL}/tests/${edge.node.id}?graph=time`,
-            classes: [this.testStatusToColorClass(edge.node.timeStatusCategory)],
+            classes: [testStatusToColorClass(edge.node.timeStatusCategory, edge.node.details, notRunSkippedDetailsRegex)],
           },
           history: {
             value: '',
@@ -349,19 +365,6 @@ export default {
   },
 
   methods: {
-    testStatusToColorClass(status) {
-      switch (status) {
-        case 'PASSED':
-          return 'normal';
-        case 'FAILED':
-          return 'error';
-        case 'NOT_RUN':
-          return 'warning';
-        default:
-          return '';
-      }
-    },
-
     humanReadableTestStatus(status) {
       switch (status) {
         case 'PASSED':
diff --git a/resources/js/vue/components/ProjectSettings/GeneralTab.vue b/resources/js/vue/components/ProjectSettings/GeneralTab.vue
index 2e68a274c6..96d9468323 100644
--- a/resources/js/vue/components/ProjectSettings/GeneralTab.vue
+++ b/resources/js/vue/components/ProjectSettings/GeneralTab.vue
@@ -362,7 +362,8 @@
       </FormSection>
 
       <FormSection
-        title="Tests"
+        title="Testing"
+        section-id="Testing"
       >
         <CheckboxField
           v-model="form.enableTestTiming"
@@ -416,6 +417,14 @@
           min="0"
           test-id="test-time-std-multiplier-input"
         />
+
+        <TextAreaField
+          v-model="form.notRunSkippedDetailsRegex"
+          :validation-error="validationErrors?.notRunSkippedDetailsRegex?.[0]"
+          label="Skipped Not Run Test Details Pattern"
+          description="One pattern per line. When a not-run test's details match a pattern, it is shown in green. Glob wildcards (*) are supported; the default *skip* matches skip case-insensitively."
+          test-id="not-run-skipped-details-regex-input"
+        />
       </FormSection>
 
       <FormSection title="">
@@ -541,6 +550,7 @@ export default {
         fileUploadLimit: 50,
         showCoverageCode: true,
         banner: '',
+        notRunSkippedDetailsRegex: '*skip*',
       },
       validationErrors: {},
       fatalError: null,
@@ -584,6 +594,7 @@ export default {
             fileUploadLimit
             showCoverageCode
             banner
+            notRunSkippedDetailsRegex
           }
         }
       `,
diff --git a/resources/js/vue/components/ProjectSettingsPage.vue b/resources/js/vue/components/ProjectSettingsPage.vue
index 66a6d89bc7..eeb4012426 100644
--- a/resources/js/vue/components/ProjectSettingsPage.vue
+++ b/resources/js/vue/components/ProjectSettingsPage.vue
@@ -97,5 +97,22 @@ export default {
       currentSection: 'general',
     };
   },
+
+  mounted() {
+    this.navigateToHashSection();
+  },
+
+  methods: {
+    navigateToHashSection() {
+      if (window.location.hash !== '#Testing') {
+        return;
+      }
+
+      this.currentSection = 'general';
+      this.$nextTick(() => {
+        document.getElementById('Testing')?.scrollIntoView();
+      });
+    },
+  },
 };
 </script>
diff --git a/resources/js/vue/components/TestIdPage.vue b/resources/js/vue/components/TestIdPage.vue
index 12cb8f31e1..395e2beffb 100644
--- a/resources/js/vue/components/TestIdPage.vue
+++ b/resources/js/vue/components/TestIdPage.vue
@@ -334,6 +334,7 @@ import {
   faChartLine,
   faLink,
 } from '@fortawesome/free-solid-svg-icons';
+import { detailsMatchesSkippedPattern } from './shared/TestDisplay';
 
 export default {
   name: 'TestIdPage',
@@ -382,6 +383,7 @@ export default {
               enableTestTiming
               testTimeStdMultiplier
               testTimeStdThreshold
+              notRunSkippedDetailsRegex
             }
           }
         }
@@ -517,6 +519,20 @@ export default {
     },
 
     testStatusPillClass() {
+      if (!this.test) {
+        return 'tw-bg-neutral tw-text-neutral-content';
+      }
+
+      if (
+        this.test.status === 'NOT_RUN'
+        && detailsMatchesSkippedPattern(
+          this.test.details,
+          this.build?.project?.notRunSkippedDetailsRegex ?? '*skip*',
+        )
+      ) {
+        return 'tw-bg-success tw-text-success-content';
+      }
+
       switch (this.test.status) {
         case 'PASSED':
           return 'tw-bg-success tw-text-success-content';
diff --git a/resources/js/vue/components/shared/FormSection.vue b/resources/js/vue/components/shared/FormSection.vue
index c95a864cb6..3061ef9487 100644
--- a/resources/js/vue/components/shared/FormSection.vue
+++ b/resources/js/vue/components/shared/FormSection.vue
@@ -1,5 +1,8 @@
 <template>
-  <section class="tw-container tw-mx-auto">
+  <section
+    :id="sectionId"
+    class="tw-container tw-mx-auto"
+  >
     <h4 class="tw-text-xl tw-font-semibold tw-border-b tw-pb-2 tw-mb-2">
       {{ title }}
     </h4>
@@ -18,6 +21,12 @@ export default {
       type: String,
       required: true,
     },
+
+    sectionId: {
+      type: String,
+      required: false,
+      default: null,
+    },
   },
 };
 </script>
diff --git a/resources/js/vue/components/shared/TestDisplay.js b/resources/js/vue/components/shared/TestDisplay.js
new file mode 100644
index 0000000000..5a0979a390
--- /dev/null
+++ b/resources/js/vue/components/shared/TestDisplay.js
@@ -0,0 +1,99 @@
+/**
+ * @param {string} pattern
+ * @returns {RegExp|null}
+ */
+export function patternToRegExp(pattern) {
+  const trimmed = pattern.trim();
+  if (trimmed === '') {
+    return null;
+  }
+
+  if (trimmed.startsWith('/')) {
+    const lastSlash = trimmed.lastIndexOf('/');
+    if (lastSlash > 0) {
+      const body = trimmed.slice(1, lastSlash);
+      const flags = trimmed.slice(lastSlash + 1);
+      try {
+        return new RegExp(body, flags);
+      } catch {
+        return null;
+      }
+    }
+  }
+
+  let regexBody = '';
+  for (const part of trimmed.split(/([*?])/)) {
+    if (part === '*') {
+      regexBody += '.*';
+    } else if (part === '?') {
+      regexBody += '.';
+    } else {
+      regexBody += part.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    }
+  }
+
+  try {
+    return new RegExp(regexBody, 'i');
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * @param {string} details
+ * @param {string} patternsText
+ */
+export function detailsMatchesSkippedPattern(details, patternsText) {
+  if (!details || !patternsText?.trim()) {
+    return false;
+  }
+
+  return patternsText
+    .split(/\r\n|\n|\r/)
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+    .some((pattern) => {
+      const regexp = patternToRegExp(pattern);
+      return regexp !== null && regexp.test(details);
+    });
+}
+
+/**
+ * @param {string} status GraphQL TestStatus enum value.
+ * @param {string} details
+ * @param {string} patternsText
+ */
+export function testStatusToColorClass(status, details = '', patternsText = '') {
+  if (status === 'NOT_RUN' && detailsMatchesSkippedPattern(details, patternsText)) {
+    return 'normal';
+  }
+
+  switch (status) {
+  case 'PASSED':
+    return 'normal';
+  case 'FAILED':
+    return 'error';
+  case 'NOT_RUN':
+    return 'warning';
+  default:
+    return '';
+  }
+}
+
+/**
+ * @param {string} status
+ * @param {string} details
+ * @param {string} patternsText
+ */
+export function testStatusToTextColorClass(status, details = '', patternsText = '') {
+  switch (testStatusToColorClass(status, details, patternsText)) {
+  case 'normal':
+    return 'normal-text';
+  case 'warning':
+    return 'warning-text';
+  case 'error':
+    return 'error-text';
+  default:
+    return '';
+  }
+}
diff --git a/tests/Browser/Pages/BuildTestsPageTest.php b/tests/Browser/Pages/BuildTestsPageTest.php
index 3f4c009246..cc7d168fa9 100644
--- a/tests/Browser/Pages/BuildTestsPageTest.php
+++ b/tests/Browser/Pages/BuildTestsPageTest.php
@@ -521,4 +521,50 @@ public function testOnlyDeltaNoResults(): void
             ;
         });
     }
+
+    public function testNotRunMatchingSkippedPatternShownInGreen(): void
+    {
+        $this->project->notrun_skipped_details_regex = '*skip*';
+        $this->project->save();
+
+        /** @var Build $build */
+        $build = $this->project->builds()->create([
+            'siteid' => $this->site->id,
+            'name' => Str::uuid()->toString(),
+            'uuid' => Str::uuid()->toString(),
+        ]);
+
+        /** @var Test $skipped_not_run_test */
+        $skipped_not_run_test = $build->tests()->create([
+            'testname' => Str::uuid()->toString(),
+            'status' => 'notrun',
+            'details' => 'Test SKIPPED intentionally',
+            'outputid' => $this->testOutput->id,
+        ]);
+
+        /** @var Test $warning_not_run_test */
+        $warning_not_run_test = $build->tests()->create([
+            'testname' => Str::uuid()->toString(),
+            'status' => 'notrun',
+            'details' => 'Unable to find executable',
+            'outputid' => $this->testOutput->id,
+        ]);
+
+        $this->browse(function (Browser $browser) use ($skipped_not_run_test, $warning_not_run_test, $build): void {
+            $browser->visit("/builds/{$build->id}/tests")
+                ->waitFor('@tests-table')
+                ->waitForText($skipped_not_run_test->testname)
+            ;
+
+            self::assertTrue($browser->script(
+                'return document.querySelector(\'a[href*="/tests/' . $skipped_not_run_test->id . '"]\')'
+                . '?.closest("tr")?.querySelector("td.normal") !== null',
+            )[0]);
+
+            self::assertTrue($browser->script(
+                'return document.querySelector(\'a[href*="/tests/' . $warning_not_run_test->id . '"]\')'
+                . '?.closest("tr")?.querySelector("td.warning") !== null',
+            )[0]);
+        });
+    }
 }
diff --git a/tests/Feature/GraphQL/BuildTypeTest.php b/tests/Feature/GraphQL/BuildTypeTest.php
index dc64e01d49..8ab19a7ad2 100644
--- a/tests/Feature/GraphQL/BuildTypeTest.php
+++ b/tests/Feature/GraphQL/BuildTypeTest.php
@@ -10,6 +10,7 @@
 use App\Models\Label;
 use App\Models\Project;
 use App\Models\Target;
+use App\Models\TestOutput;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
@@ -651,4 +652,57 @@ public function testPercentCoverageForPath(string $path, ?float $expected_percen
             ],
         ]);
     }
+
+    public function testNotRunTestsWarningCountExcludesSkippedPatterns(): void
+    {
+        $this->project->notrun_skipped_details_regex = '*skip*';
+        $this->project->save();
+
+        $output = TestOutput::create([
+            'path' => 'a',
+            'command' => 'b',
+            'output' => 'c',
+        ]);
+
+        /** @var Build $build */
+        $build = $this->project->builds()->create([
+            'name' => 'build-with-skipped-tests',
+            'uuid' => Str::uuid()->toString(),
+            'testnotrun' => 2,
+        ]);
+
+        $build->tests()->create([
+            'testname' => 'skipped_test',
+            'status' => 'notrun',
+            'details' => 'skipped',
+            'outputid' => $output->id,
+        ]);
+
+        $build->tests()->create([
+            'testname' => 'missing_test',
+            'status' => 'notrun',
+            'details' => 'Unable to find executable',
+            'outputid' => $output->id,
+        ]);
+
+        $this->graphQL('
+            query build($id: ID!) {
+                build(id: $id) {
+                    notRunTestsCount
+                    notRunTestsWarningCount
+                }
+            }
+        ', [
+            'id' => $build->id,
+        ])->assertExactJson([
+            'data' => [
+                'build' => [
+                    'notRunTestsCount' => 2,
+                    'notRunTestsWarningCount' => 1,
+                ],
+            ],
+        ]);
+
+        $output->delete();
+    }
 }
diff --git a/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php b/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
index d454df8785..0505020daa 100644
--- a/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
+++ b/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
@@ -207,6 +207,8 @@ public static function fieldValues(): array
             ['fileUploadLimit', 50, 'uploadquota', 53687091200],
             ['showCoverageCode', false, 'showcoveragecode', false],
             ['banner', 'new banner', 'banner', 'new banner'],
+            ['notRunSkippedDetailsRegex', '*skip*', 'notrun_skipped_details_regex', '*skip*'],
+            ['notRunSkippedDetailsRegex', "Skip\nDisabled", 'notrun_skipped_details_regex', "Skip\nDisabled"],
         ];
     }
 
@@ -269,6 +271,30 @@ public function testCannotChangeNameToExistingProjectName(): void
         self::assertSame($original_name, $project1->fresh()?->name);
     }
 
+    public function testCannotSetInvalidNotRunSkippedDetailsRegex(): void
+    {
+        $project = $this->makePublicProject();
+        $user = $this->makeAdminUser();
+
+        $this->actingAs($user)->graphQL('
+            mutation updateProject($input: UpdateProjectInput!) {
+                updateProject(input: $input) {
+                    project {
+                        notRunSkippedDetailsRegex
+                    }
+                    message
+                }
+            }
+        ', [
+            'input' => [
+                'id' => $project->id,
+                'notRunSkippedDetailsRegex' => '(',
+            ],
+        ])->assertGraphQLErrorMessage('Validation failed for the field [updateProject].');
+
+        self::assertSame('*skip*', $project->fresh()?->notrun_skipped_details_regex);
+    }
+
     public function testCannotChangeNameToInvalidName(): void
     {
         $project = $this->makePublicProject();
diff --git a/tests/Feature/GraphQL/ProjectTypeTest.php b/tests/Feature/GraphQL/ProjectTypeTest.php
index e5719bd30f..45b70b4b31 100644
--- a/tests/Feature/GraphQL/ProjectTypeTest.php
+++ b/tests/Feature/GraphQL/ProjectTypeTest.php
@@ -166,6 +166,8 @@ public static function fieldValues(): array
             ['showcoveragecode', false, 'showCoverageCode', false],
             ['banner', 'test', 'banner', 'test'],
             ['banner', null, 'banner', null],
+            ['notrun_skipped_details_regex', '*skip*', 'notRunSkippedDetailsRegex', '*skip*'],
+            ['notrun_skipped_details_regex', 'Disabled', 'notRunSkippedDetailsRegex', 'Disabled'],
         ];
     }
 
diff --git a/tests/Unit/Utils/TestDisplayTest.php b/tests/Unit/Utils/TestDisplayTest.php
new file mode 100644
index 0000000000..8376ee988c
--- /dev/null
+++ b/tests/Unit/Utils/TestDisplayTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Unit\Utils;
+
+use App\Models\Test;
+use App\Utils\TestDisplay;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\TestCase;
+
+class TestDisplayTest extends TestCase
+{
+    #[DataProvider('detailsMatchesSkippedPatternCases')]
+    public function testDetailsMatchesSkippedPattern(
+        string $details,
+        string $patternsText,
+        bool $expected,
+    ): void {
+        self::assertSame(
+            $expected,
+            TestDisplay::detailsMatchesSkippedPattern($details, $patternsText),
+        );
+    }
+
+    /**
+     * @return list<array{string, string, bool}>
+     */
+    public static function detailsMatchesSkippedPatternCases(): array
+    {
+        return [
+            ['Test skipped by user', '*skip*', true],
+            ['Test SKIPPED by user', '*skip*', true],
+            ['Test SkIpPeD by user', '*skip*', true],
+            ['Disabled', '*skip*', false],
+            ['', '*skip*', false],
+            ['Skipped', 'Skipped', true],
+            ['Skipped', 'Disabled', false],
+            ['foo bar baz', "*bar*", true],
+        ];
+    }
+
+    #[DataProvider('statusColorClassCases')]
+    public function testStatusColorClass(
+        string $status,
+        ?string $details,
+        string $patternsText,
+        string $expected,
+    ): void {
+        self::assertSame(
+            $expected,
+            TestDisplay::statusColorClass($status, $details, $patternsText),
+        );
+    }
+
+    /**
+     * @return list<array{string, ?string, string, string}>
+     */
+    public static function statusColorClassCases(): array
+    {
+        return [
+            [Test::PASSED, null, '*skip*', 'normal'],
+            [Test::FAILED, null, '*skip*', 'error'],
+            [Test::NOTRUN, 'Some reason', '*skip*', 'warning'],
+            [Test::NOTRUN, 'Test skipped', '*skip*', 'normal'],
+            [Test::NOTRUN, 'Test SKIPPED', '*skip*', 'normal'],
+        ];
+    }
+
+    public function testDefaultPatternConstant(): void
+    {
+        self::assertSame('*skip*', TestDisplay::DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX);
+    }
+
+    public function testIsValidPatternsTextRejectsInvalidRegex(): void
+    {
+        self::assertFalse(TestDisplay::isValidPatternsText('('));
+    }
+
+    public function testIsValidPatternsTextAcceptsDefaultPattern(): void
+    {
+        self::assertTrue(TestDisplay::isValidPatternsText('*skip*'));
+    }
+}

From 4033104f7f07a80d1dce4ddba0802589cea717f8 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Thu, 6 Aug 2026 19:00:09 -0400
Subject: [PATCH 02/11] Refactor handling of not-run test details

This commit removes the `notRunSkippedDetailsRegex` property from the Project model and associated validation rule, simplifying the logic for handling not-run tests. The `notRunTestsWarningCount` method in the Build model is updated to exclude tests with details marked as "Disabled". The GraphQL schema and UI components are adjusted accordingly to reflect these changes. Additionally, tests are updated to ensure correct behavior without the regex pattern handling.
---
 .../UpdateProjectInputValidator.php           |   6 -
 app/Models/Build.php                          |   7 +-
 app/Models/Project.php                        |   4 -
 app/Rules/NotRunSkippedDetailsRegexRule.php   |  26 -----
 app/Utils/TestDisplay.php                     | 108 ++----------------
 app/cdash/app/Controller/Api/QueryTests.php   |   2 -
 ...otrun_skipped_details_regex_to_project.php |  15 ---
 graphql/schema.graphql                        |  16 +--
 .../js/vue/components/BuildTestsPage.vue      |  19 +--
 .../components/ProjectSettings/GeneralTab.vue |  10 --
 resources/js/vue/components/TestIdPage.vue    |  11 +-
 .../js/vue/components/shared/TestDisplay.js   |  69 ++---------
 tests/Browser/Pages/BuildTestsPageTest.php    |  17 ++-
 tests/Feature/GraphQL/BuildTypeTest.php       |  11 +-
 .../GraphQL/Mutations/UpdateProjectTest.php   |  26 -----
 tests/Feature/GraphQL/ProjectTypeTest.php     |   2 -
 tests/Unit/Utils/TestDisplayTest.php          |  63 ++++------
 17 files changed, 61 insertions(+), 351 deletions(-)
 delete mode 100644 app/Rules/NotRunSkippedDetailsRegexRule.php
 delete mode 100644 database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php

diff --git a/app/GraphQL/Validators/UpdateProjectInputValidator.php b/app/GraphQL/Validators/UpdateProjectInputValidator.php
index 9d176a6436..0dc314ed3a 100644
--- a/app/GraphQL/Validators/UpdateProjectInputValidator.php
+++ b/app/GraphQL/Validators/UpdateProjectInputValidator.php
@@ -3,7 +3,6 @@
 namespace App\GraphQL\Validators;
 
 use App\Models\Project;
-use App\Rules\NotRunSkippedDetailsRegexRule;
 use App\Rules\ProjectAuthenticateSubmissionsRule;
 use App\Rules\ProjectNameRule;
 use App\Rules\ProjectVisibilityRule;
@@ -26,11 +25,6 @@ public function rules(): array
             'authenticateSubmissions' => [
                 new ProjectAuthenticateSubmissionsRule(),
             ],
-            'notRunSkippedDetailsRegex' => [
-                'nullable',
-                'string',
-                new NotRunSkippedDetailsRegexRule(),
-            ],
         ];
     }
 
diff --git a/app/Models/Build.php b/app/Models/Build.php
index 98402a0684..6d856f9e4f 100644
--- a/app/Models/Build.php
+++ b/app/Models/Build.php
@@ -403,16 +403,13 @@ public function percentCoverageForPath(string $path): ?float
     }
 
     /**
-     * The number of not-run tests whose details do not match the project's skipped pattern.
+     * The number of not-run tests whose details are not "Disabled".
      */
     public function notRunTestsWarningCount(): int
     {
-        $patterns = $this->project?->notrun_skipped_details_regex
-            ?? TestDisplay::DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX;
-
         $count = 0;
         foreach ($this->tests()->where('status', Test::NOTRUN)->pluck('details') as $details) {
-            if (!TestDisplay::isAcceptableNotRun($details, $patterns)) {
+            if (!TestDisplay::isAcceptableNotRun($details)) {
                 $count++;
             }
         }
diff --git a/app/Models/Project.php b/app/Models/Project.php
index c102b9200e..11b7987ed4 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Enums\ProjectRole;
-use App\Utils\TestDisplay;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -50,7 +49,6 @@
  * @property ?string $banner
  * @property ?string $logoUrl
  * @property ?string $cmakeprojectroot
- * @property string $notrun_skipped_details_regex
  *
  * @method Builder<Project> forUser()
  * @method Builder<Project> administeredByUser()
@@ -97,7 +95,6 @@ class Project extends Model
         'ldapfilter',
         'banner',
         'cmakeprojectroot',
-        'notrun_skipped_details_regex',
     ];
 
     protected $casts = [
@@ -140,7 +137,6 @@ class Project extends Model
         'uploadquota' => 10,
         'showcoveragecode' => true,
         'authenticatesubmissions' => false,
-        'notrun_skipped_details_regex' => TestDisplay::DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX,
     ];
 
     public const ACCESS_PRIVATE = 0;
diff --git a/app/Rules/NotRunSkippedDetailsRegexRule.php b/app/Rules/NotRunSkippedDetailsRegexRule.php
deleted file mode 100644
index d6d9c402dd..0000000000
--- a/app/Rules/NotRunSkippedDetailsRegexRule.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Rules;
-
-use App\Utils\TestDisplay;
-use Closure;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-final class NotRunSkippedDetailsRegexRule implements ValidationRule
-{
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        if ($value === null || $value === '') {
-            return;
-        }
-
-        if (!is_string($value)) {
-            $fail('The skipped test details pattern must be a string.');
-            return;
-        }
-
-        if (!TestDisplay::isValidPatternsText($value)) {
-            $fail('The skipped test details pattern contains an invalid regular expression.');
-        }
-    }
-}
diff --git a/app/Utils/TestDisplay.php b/app/Utils/TestDisplay.php
index a4e67670c7..f1bb526307 100644
--- a/app/Utils/TestDisplay.php
+++ b/app/Utils/TestDisplay.php
@@ -6,87 +6,19 @@
 
 final class TestDisplay
 {
-    public const DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX = '*skip*';
-
     /**
-     * @return list<string>
+     * CTest sets Details="Disabled" for tests marked DISABLED.
      */
-    public static function parsePatterns(?string $patternsText): array
-    {
-        if ($patternsText === null || trim($patternsText) === '') {
-            return [];
-        }
-
-        $patterns = [];
-        foreach (preg_split("/\r\n|\n|\r/", $patternsText) as $line) {
-            $line = trim($line);
-            if ($line !== '') {
-                $patterns[] = $line;
-            }
-        }
+    public const DISABLED_DETAILS = 'Disabled';
 
-        return $patterns;
-    }
-
-    public static function patternToPcre(string $pattern): string
+    public static function isAcceptableNotRun(?string $details): bool
     {
-        $pattern = trim($pattern);
-        if ($pattern === '') {
-            return '';
-        }
-
-        if (str_starts_with($pattern, '/')) {
-            return $pattern;
-        }
-
-        $parts = preg_split('/(\*|\?)/', $pattern, -1, PREG_SPLIT_DELIM_CAPTURE);
-        if ($parts === false) {
-            return '';
-        }
-
-        $regex = '';
-        foreach ($parts as $part) {
-            if ($part === '*') {
-                $regex .= '.*';
-            } elseif ($part === '?') {
-                $regex .= '.';
-            } else {
-                $regex .= preg_quote($part, '/');
-            }
-        }
-
-        return '/(?i)' . $regex . '/';
+        return $details === self::DISABLED_DETAILS;
     }
 
-    public static function detailsMatchesSkippedPattern(?string $details, ?string $patternsText): bool
+    public static function statusColorClass(string $status, ?string $details): string
     {
-        if ($details === null || $details === '') {
-            return false;
-        }
-
-        foreach (self::parsePatterns($patternsText) as $pattern) {
-            $pcre = self::patternToPcre($pattern);
-            if ($pcre === '') {
-                continue;
-            }
-
-            $result = @preg_match($pcre, $details);
-            if ($result === 1) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static function isAcceptableNotRun(?string $details, ?string $patternsText): bool
-    {
-        return self::detailsMatchesSkippedPattern($details, $patternsText);
-    }
-
-    public static function statusColorClass(string $status, ?string $details, ?string $patternsText): string
-    {
-        if ($status === Test::NOTRUN && self::isAcceptableNotRun($details, $patternsText)) {
+        if ($status === Test::NOTRUN && self::isAcceptableNotRun($details)) {
             return 'normal';
         }
 
@@ -98,9 +30,9 @@ public static function statusColorClass(string $status, ?string $details, ?strin
         };
     }
 
-    public static function statusTextColorClass(string $status, ?string $details, ?string $patternsText): string
+    public static function statusTextColorClass(string $status, ?string $details): string
     {
-        return match (self::statusColorClass($status, $details, $patternsText)) {
+        return match (self::statusColorClass($status, $details)) {
             'normal' => 'normal-text',
             'warning' => 'warning-text',
             'error' => 'error-text',
@@ -108,7 +40,7 @@ public static function statusTextColorClass(string $status, ?string $details, ?s
         };
     }
 
-    public static function graphqlStatusColorClass(string $status, ?string $details, ?string $patternsText): string
+    public static function graphqlStatusColorClass(string $status, ?string $details): string
     {
         $dbStatus = match ($status) {
             'NOT_RUN' => Test::NOTRUN,
@@ -117,26 +49,6 @@ public static function graphqlStatusColorClass(string $status, ?string $details,
             default => strtolower($status),
         };
 
-        return self::statusColorClass($dbStatus, $details, $patternsText);
-    }
-
-    public static function isValidPatternsText(?string $patternsText): bool
-    {
-        foreach (self::parsePatterns($patternsText) as $pattern) {
-            $pcre = self::patternToPcre($pattern);
-            if ($pcre === '') {
-                return false;
-            }
-
-            set_error_handler(static fn (): bool => true);
-            $result = preg_match($pcre, '');
-            restore_error_handler();
-
-            if ($result === false) {
-                return false;
-            }
-        }
-
-        return true;
+        return self::statusColorClass($dbStatus, $details);
     }
 }
diff --git a/app/cdash/app/Controller/Api/QueryTests.php b/app/cdash/app/Controller/Api/QueryTests.php
index 0899abe869..e82746126c 100644
--- a/app/cdash/app/Controller/Api/QueryTests.php
+++ b/app/cdash/app/Controller/Api/QueryTests.php
@@ -376,7 +376,6 @@ public function getResponse(): array
                 ", $query_params);
 
         // Rows of test data to be displayed to the user.
-        $notRunSkippedDetailsRegex = EloquentProject::findOrFail($this->project->Id)->notrun_skipped_details_regex;
         $tests = [];
         foreach ($rows as $row) {
             $test = [];
@@ -428,7 +427,6 @@ public function getResponse(): array
                     $test['statusclass'] = TestDisplay::statusColorClass(
                         'notrun',
                         $row->details,
-                        $notRunSkippedDetailsRegex,
                     );
                     break;
             }
diff --git a/database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php b/database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php
deleted file mode 100644
index e2a61e4547..0000000000
--- a/database/migrations/2026_05_26_120000_add_notrun_skipped_details_regex_to_project.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration {
-    public function up(): void
-    {
-        DB::statement("ALTER TABLE project ADD COLUMN notrun_skipped_details_regex text NOT NULL DEFAULT '*skip*'");
-    }
-
-    public function down(): void
-    {
-    }
-};
diff --git a/graphql/schema.graphql b/graphql/schema.graphql
index ba63fd858d..1ae17527b8 100644
--- a/graphql/schema.graphql
+++ b/graphql/schema.graphql
@@ -398,13 +398,6 @@ type Project {
   "Invitations to this project which have not been accepted yet."
   invitations: [ProjectInvitation!]! @canRoot(ability: "inviteUser") @hasMany(type: CONNECTION) @orderBy(column: "id")
 
-  """
-  Regular expression(s), one per line, matched against not-run test details. Matching tests are
-  displayed in green instead of yellow. Glob wildcards (*) are supported. The default pattern is
-  *skip* (case insensitive).
-  """
-  notRunSkippedDetailsRegex: String! @rename(attribute: "notrun_skipped_details_regex")
-
   """
   Pinned test measurements are test measurements, identified by name, which should be shown
   alongside Test details throughout the site.
@@ -522,12 +515,6 @@ input UpdateProjectInput @validator {
   showCoverageCode: Boolean @rename(attribute: "showcoveragecode")
 
   banner: String
-
-  """
-  Regular expression(s), one per line, matched against not-run test details. Matching tests are
-  displayed in green instead of yellow.
-  """
-  notRunSkippedDetailsRegex: String @rename(attribute: "notrun_skipped_details_regex")
 }
 
 
@@ -870,8 +857,7 @@ type Build {
   notRunTestsCount: Int @rename(attribute: "testnotrun")
 
   """
-  The number of not-run tests counted as warnings (excludes tests whose details match the
-  project's skipped-test pattern).
+  The number of not-run tests counted as warnings (excludes tests whose details are "Disabled").
   """
   notRunTestsWarningCount: Int! @method(name: "notRunTestsWarningCount")
 
diff --git a/resources/js/vue/components/BuildTestsPage.vue b/resources/js/vue/components/BuildTestsPage.vue
index 7422904b7b..0484367b46 100644
--- a/resources/js/vue/components/BuildTestsPage.vue
+++ b/resources/js/vue/components/BuildTestsPage.vue
@@ -83,9 +83,6 @@ const TEST_QUERY = gql`
   ) {
     build(id: $buildid) {
       id
-      project {
-        notRunSkippedDetailsRegex
-      }
       tests(filters: $filters, first: 1000000) {
         edges {
           node {
@@ -209,11 +206,6 @@ export default {
         });
         return tests;
       },
-      result({ data }) {
-        if (data?.build?.project?.notRunSkippedDetailsRegex !== undefined) {
-          this.notRunSkippedDetailsRegex = data.build.project.notRunSkippedDetailsRegex;
-        }
-      },
       variables() {
         return {
           buildid: this.buildId,
@@ -246,11 +238,6 @@ export default {
         });
         return tests;
       },
-      result({ data }) {
-        if (data?.build?.project?.notRunSkippedDetailsRegex !== undefined) {
-          this.notRunSkippedDetailsRegex = data.build.project.notRunSkippedDetailsRegex;
-        }
-      },
       variables() {
         return {
           buildid: this.previousBuildId,
@@ -273,7 +260,6 @@ export default {
   data() {
     return {
       changedFilters: JSON.parse(JSON.stringify(this.initialFilters)),
-      notRunSkippedDetailsRegex: '*skip*',
     };
   },
 
@@ -323,7 +309,6 @@ export default {
     },
 
     formattedTestRows() {
-      const notRunSkippedDetailsRegex = this.notRunSkippedDetailsRegex;
       return this.filteredTests?.map((edge) => {
         return {
           name: {
@@ -341,14 +326,14 @@ export default {
             value: edge.node.status,
             text: this.humanReadableTestStatus(edge.node.status),
             href: `${this.$baseURL}/tests/${edge.node.id}`,
-            classes: [testStatusToColorClass(edge.node.status, edge.node.details, notRunSkippedDetailsRegex)],
+            classes: [testStatusToColorClass(edge.node.status, edge.node.details)],
           },
           subProject: edge.subProject ?? '',
           timeStatus: {
             value: edge.node.timeStatusCategory,
             text: this.humanReadableTestStatus(edge.node.timeStatusCategory),
             href: `${this.$baseURL}/tests/${edge.node.id}?graph=time`,
-            classes: [testStatusToColorClass(edge.node.timeStatusCategory, edge.node.details, notRunSkippedDetailsRegex)],
+            classes: [testStatusToColorClass(edge.node.timeStatusCategory, edge.node.details)],
           },
           history: {
             value: '',
diff --git a/resources/js/vue/components/ProjectSettings/GeneralTab.vue b/resources/js/vue/components/ProjectSettings/GeneralTab.vue
index 96d9468323..48a6838793 100644
--- a/resources/js/vue/components/ProjectSettings/GeneralTab.vue
+++ b/resources/js/vue/components/ProjectSettings/GeneralTab.vue
@@ -417,14 +417,6 @@
           min="0"
           test-id="test-time-std-multiplier-input"
         />
-
-        <TextAreaField
-          v-model="form.notRunSkippedDetailsRegex"
-          :validation-error="validationErrors?.notRunSkippedDetailsRegex?.[0]"
-          label="Skipped Not Run Test Details Pattern"
-          description="One pattern per line. When a not-run test's details match a pattern, it is shown in green. Glob wildcards (*) are supported; the default *skip* matches skip case-insensitively."
-          test-id="not-run-skipped-details-regex-input"
-        />
       </FormSection>
 
       <FormSection title="">
@@ -550,7 +542,6 @@ export default {
         fileUploadLimit: 50,
         showCoverageCode: true,
         banner: '',
-        notRunSkippedDetailsRegex: '*skip*',
       },
       validationErrors: {},
       fatalError: null,
@@ -594,7 +585,6 @@ export default {
             fileUploadLimit
             showCoverageCode
             banner
-            notRunSkippedDetailsRegex
           }
         }
       `,
diff --git a/resources/js/vue/components/TestIdPage.vue b/resources/js/vue/components/TestIdPage.vue
index 395e2beffb..9b6a010873 100644
--- a/resources/js/vue/components/TestIdPage.vue
+++ b/resources/js/vue/components/TestIdPage.vue
@@ -334,7 +334,7 @@ import {
   faChartLine,
   faLink,
 } from '@fortawesome/free-solid-svg-icons';
-import { detailsMatchesSkippedPattern } from './shared/TestDisplay';
+import { isAcceptableNotRun } from './shared/TestDisplay';
 
 export default {
   name: 'TestIdPage',
@@ -383,7 +383,6 @@ export default {
               enableTestTiming
               testTimeStdMultiplier
               testTimeStdThreshold
-              notRunSkippedDetailsRegex
             }
           }
         }
@@ -523,13 +522,7 @@ export default {
         return 'tw-bg-neutral tw-text-neutral-content';
       }
 
-      if (
-        this.test.status === 'NOT_RUN'
-        && detailsMatchesSkippedPattern(
-          this.test.details,
-          this.build?.project?.notRunSkippedDetailsRegex ?? '*skip*',
-        )
-      ) {
+      if (this.test.status === 'NOT_RUN' && isAcceptableNotRun(this.test.details)) {
         return 'tw-bg-success tw-text-success-content';
       }
 
diff --git a/resources/js/vue/components/shared/TestDisplay.js b/resources/js/vue/components/shared/TestDisplay.js
index 5a0979a390..4a78b8d055 100644
--- a/resources/js/vue/components/shared/TestDisplay.js
+++ b/resources/js/vue/components/shared/TestDisplay.js
@@ -1,70 +1,22 @@
 /**
- * @param {string} pattern
- * @returns {RegExp|null}
+ * CTest sets Details="Disabled" for tests marked DISABLED.
  */
-export function patternToRegExp(pattern) {
-  const trimmed = pattern.trim();
-  if (trimmed === '') {
-    return null;
-  }
-
-  if (trimmed.startsWith('/')) {
-    const lastSlash = trimmed.lastIndexOf('/');
-    if (lastSlash > 0) {
-      const body = trimmed.slice(1, lastSlash);
-      const flags = trimmed.slice(lastSlash + 1);
-      try {
-        return new RegExp(body, flags);
-      } catch {
-        return null;
-      }
-    }
-  }
-
-  let regexBody = '';
-  for (const part of trimmed.split(/([*?])/)) {
-    if (part === '*') {
-      regexBody += '.*';
-    } else if (part === '?') {
-      regexBody += '.';
-    } else {
-      regexBody += part.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    }
-  }
-
-  try {
-    return new RegExp(regexBody, 'i');
-  } catch {
-    return null;
-  }
-}
+export const DISABLED_DETAILS = 'Disabled';
 
 /**
- * @param {string} details
- * @param {string} patternsText
+ * @param {string|null|undefined} details
+ * @returns {boolean}
  */
-export function detailsMatchesSkippedPattern(details, patternsText) {
-  if (!details || !patternsText?.trim()) {
-    return false;
-  }
-
-  return patternsText
-    .split(/\r\n|\n|\r/)
-    .map((line) => line.trim())
-    .filter((line) => line.length > 0)
-    .some((pattern) => {
-      const regexp = patternToRegExp(pattern);
-      return regexp !== null && regexp.test(details);
-    });
+export function isAcceptableNotRun(details) {
+  return details === DISABLED_DETAILS;
 }
 
 /**
  * @param {string} status GraphQL TestStatus enum value.
  * @param {string} details
- * @param {string} patternsText
  */
-export function testStatusToColorClass(status, details = '', patternsText = '') {
-  if (status === 'NOT_RUN' && detailsMatchesSkippedPattern(details, patternsText)) {
+export function testStatusToColorClass(status, details = '') {
+  if (status === 'NOT_RUN' && isAcceptableNotRun(details)) {
     return 'normal';
   }
 
@@ -83,10 +35,9 @@ export function testStatusToColorClass(status, details = '', patternsText = '')
 /**
  * @param {string} status
  * @param {string} details
- * @param {string} patternsText
  */
-export function testStatusToTextColorClass(status, details = '', patternsText = '') {
-  switch (testStatusToColorClass(status, details, patternsText)) {
+export function testStatusToTextColorClass(status, details = '') {
+  switch (testStatusToColorClass(status, details)) {
   case 'normal':
     return 'normal-text';
   case 'warning':
diff --git a/tests/Browser/Pages/BuildTestsPageTest.php b/tests/Browser/Pages/BuildTestsPageTest.php
index cc7d168fa9..4f09cc8a19 100644
--- a/tests/Browser/Pages/BuildTestsPageTest.php
+++ b/tests/Browser/Pages/BuildTestsPageTest.php
@@ -522,11 +522,8 @@ public function testOnlyDeltaNoResults(): void
         });
     }
 
-    public function testNotRunMatchingSkippedPatternShownInGreen(): void
+    public function testNotRunWithDisabledDetailsShownInGreen(): void
     {
-        $this->project->notrun_skipped_details_regex = '*skip*';
-        $this->project->save();
-
         /** @var Build $build */
         $build = $this->project->builds()->create([
             'siteid' => $this->site->id,
@@ -534,11 +531,11 @@ public function testNotRunMatchingSkippedPatternShownInGreen(): void
             'uuid' => Str::uuid()->toString(),
         ]);
 
-        /** @var Test $skipped_not_run_test */
-        $skipped_not_run_test = $build->tests()->create([
+        /** @var Test $disabled_not_run_test */
+        $disabled_not_run_test = $build->tests()->create([
             'testname' => Str::uuid()->toString(),
             'status' => 'notrun',
-            'details' => 'Test SKIPPED intentionally',
+            'details' => 'Disabled',
             'outputid' => $this->testOutput->id,
         ]);
 
@@ -550,14 +547,14 @@ public function testNotRunMatchingSkippedPatternShownInGreen(): void
             'outputid' => $this->testOutput->id,
         ]);
 
-        $this->browse(function (Browser $browser) use ($skipped_not_run_test, $warning_not_run_test, $build): void {
+        $this->browse(function (Browser $browser) use ($disabled_not_run_test, $warning_not_run_test, $build): void {
             $browser->visit("/builds/{$build->id}/tests")
                 ->waitFor('@tests-table')
-                ->waitForText($skipped_not_run_test->testname)
+                ->waitForText($disabled_not_run_test->testname)
             ;
 
             self::assertTrue($browser->script(
-                'return document.querySelector(\'a[href*="/tests/' . $skipped_not_run_test->id . '"]\')'
+                'return document.querySelector(\'a[href*="/tests/' . $disabled_not_run_test->id . '"]\')'
                 . '?.closest("tr")?.querySelector("td.normal") !== null',
             )[0]);
 
diff --git a/tests/Feature/GraphQL/BuildTypeTest.php b/tests/Feature/GraphQL/BuildTypeTest.php
index 8ab19a7ad2..32e938be53 100644
--- a/tests/Feature/GraphQL/BuildTypeTest.php
+++ b/tests/Feature/GraphQL/BuildTypeTest.php
@@ -653,11 +653,8 @@ public function testPercentCoverageForPath(string $path, ?float $expected_percen
         ]);
     }
 
-    public function testNotRunTestsWarningCountExcludesSkippedPatterns(): void
+    public function testNotRunTestsWarningCountExcludesDisabledDetails(): void
     {
-        $this->project->notrun_skipped_details_regex = '*skip*';
-        $this->project->save();
-
         $output = TestOutput::create([
             'path' => 'a',
             'command' => 'b',
@@ -666,15 +663,15 @@ public function testNotRunTestsWarningCountExcludesSkippedPatterns(): void
 
         /** @var Build $build */
         $build = $this->project->builds()->create([
-            'name' => 'build-with-skipped-tests',
+            'name' => 'build-with-disabled-tests',
             'uuid' => Str::uuid()->toString(),
             'testnotrun' => 2,
         ]);
 
         $build->tests()->create([
-            'testname' => 'skipped_test',
+            'testname' => 'disabled_test',
             'status' => 'notrun',
-            'details' => 'skipped',
+            'details' => 'Disabled',
             'outputid' => $output->id,
         ]);
 
diff --git a/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php b/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
index 0505020daa..d454df8785 100644
--- a/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
+++ b/tests/Feature/GraphQL/Mutations/UpdateProjectTest.php
@@ -207,8 +207,6 @@ public static function fieldValues(): array
             ['fileUploadLimit', 50, 'uploadquota', 53687091200],
             ['showCoverageCode', false, 'showcoveragecode', false],
             ['banner', 'new banner', 'banner', 'new banner'],
-            ['notRunSkippedDetailsRegex', '*skip*', 'notrun_skipped_details_regex', '*skip*'],
-            ['notRunSkippedDetailsRegex', "Skip\nDisabled", 'notrun_skipped_details_regex', "Skip\nDisabled"],
         ];
     }
 
@@ -271,30 +269,6 @@ public function testCannotChangeNameToExistingProjectName(): void
         self::assertSame($original_name, $project1->fresh()?->name);
     }
 
-    public function testCannotSetInvalidNotRunSkippedDetailsRegex(): void
-    {
-        $project = $this->makePublicProject();
-        $user = $this->makeAdminUser();
-
-        $this->actingAs($user)->graphQL('
-            mutation updateProject($input: UpdateProjectInput!) {
-                updateProject(input: $input) {
-                    project {
-                        notRunSkippedDetailsRegex
-                    }
-                    message
-                }
-            }
-        ', [
-            'input' => [
-                'id' => $project->id,
-                'notRunSkippedDetailsRegex' => '(',
-            ],
-        ])->assertGraphQLErrorMessage('Validation failed for the field [updateProject].');
-
-        self::assertSame('*skip*', $project->fresh()?->notrun_skipped_details_regex);
-    }
-
     public function testCannotChangeNameToInvalidName(): void
     {
         $project = $this->makePublicProject();
diff --git a/tests/Feature/GraphQL/ProjectTypeTest.php b/tests/Feature/GraphQL/ProjectTypeTest.php
index 45b70b4b31..e5719bd30f 100644
--- a/tests/Feature/GraphQL/ProjectTypeTest.php
+++ b/tests/Feature/GraphQL/ProjectTypeTest.php
@@ -166,8 +166,6 @@ public static function fieldValues(): array
             ['showcoveragecode', false, 'showCoverageCode', false],
             ['banner', 'test', 'banner', 'test'],
             ['banner', null, 'banner', null],
-            ['notrun_skipped_details_regex', '*skip*', 'notRunSkippedDetailsRegex', '*skip*'],
-            ['notrun_skipped_details_regex', 'Disabled', 'notRunSkippedDetailsRegex', 'Disabled'],
         ];
     }
 
diff --git a/tests/Unit/Utils/TestDisplayTest.php b/tests/Unit/Utils/TestDisplayTest.php
index 8376ee988c..feeeee1f71 100644
--- a/tests/Unit/Utils/TestDisplayTest.php
+++ b/tests/Unit/Utils/TestDisplayTest.php
@@ -9,32 +9,26 @@
 
 class TestDisplayTest extends TestCase
 {
-    #[DataProvider('detailsMatchesSkippedPatternCases')]
-    public function testDetailsMatchesSkippedPattern(
-        string $details,
-        string $patternsText,
-        bool $expected,
-    ): void {
-        self::assertSame(
-            $expected,
-            TestDisplay::detailsMatchesSkippedPattern($details, $patternsText),
-        );
+    #[DataProvider('isAcceptableNotRunCases')]
+    public function testIsAcceptableNotRun(?string $details, bool $expected): void
+    {
+        self::assertSame($expected, TestDisplay::isAcceptableNotRun($details));
     }
 
     /**
-     * @return list<array{string, string, bool}>
+     * @return list<array{?string, bool}>
      */
-    public static function detailsMatchesSkippedPatternCases(): array
+    public static function isAcceptableNotRunCases(): array
     {
         return [
-            ['Test skipped by user', '*skip*', true],
-            ['Test SKIPPED by user', '*skip*', true],
-            ['Test SkIpPeD by user', '*skip*', true],
-            ['Disabled', '*skip*', false],
-            ['', '*skip*', false],
-            ['Skipped', 'Skipped', true],
-            ['Skipped', 'Disabled', false],
-            ['foo bar baz', "*bar*", true],
+            ['Disabled', true],
+            ['disabled', false],
+            ['DISABLED', false],
+            ['Test Disabled', false],
+            ['Disabled test', false],
+            ['Skipped', false],
+            ['', false],
+            [null, false],
         ];
     }
 
@@ -42,41 +36,30 @@ public static function detailsMatchesSkippedPatternCases(): array
     public function testStatusColorClass(
         string $status,
         ?string $details,
-        string $patternsText,
         string $expected,
     ): void {
         self::assertSame(
             $expected,
-            TestDisplay::statusColorClass($status, $details, $patternsText),
+            TestDisplay::statusColorClass($status, $details),
         );
     }
 
     /**
-     * @return list<array{string, ?string, string, string}>
+     * @return list<array{string, ?string, string}>
      */
     public static function statusColorClassCases(): array
     {
         return [
-            [Test::PASSED, null, '*skip*', 'normal'],
-            [Test::FAILED, null, '*skip*', 'error'],
-            [Test::NOTRUN, 'Some reason', '*skip*', 'warning'],
-            [Test::NOTRUN, 'Test skipped', '*skip*', 'normal'],
-            [Test::NOTRUN, 'Test SKIPPED', '*skip*', 'normal'],
+            [Test::PASSED, null, 'normal'],
+            [Test::FAILED, null, 'error'],
+            [Test::NOTRUN, 'Some reason', 'warning'],
+            [Test::NOTRUN, 'Disabled', 'normal'],
+            [Test::NOTRUN, 'skipped', 'warning'],
         ];
     }
 
-    public function testDefaultPatternConstant(): void
-    {
-        self::assertSame('*skip*', TestDisplay::DEFAULT_NOTRUN_SKIPPED_DETAILS_REGEX);
-    }
-
-    public function testIsValidPatternsTextRejectsInvalidRegex(): void
-    {
-        self::assertFalse(TestDisplay::isValidPatternsText('('));
-    }
-
-    public function testIsValidPatternsTextAcceptsDefaultPattern(): void
+    public function testDisabledDetailsConstant(): void
     {
-        self::assertTrue(TestDisplay::isValidPatternsText('*skip*'));
+        self::assertSame('Disabled', TestDisplay::DISABLED_DETAILS);
     }
 }

From 697a4e236a726dd62a21d0ca84605747824680cc Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Fri, 7 Aug 2026 10:29:32 -0400
Subject: [PATCH 03/11] Refactor test status color class functions

This commit improves the formatting of the `testStatusToColorClass` and `testStatusToTextColorClass` functions in the TestDisplay component. The switch cases have been reformatted for better readability, maintaining the same functionality. No changes to logic or behavior were made.
---
 .../js/vue/components/shared/TestDisplay.js   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/js/vue/components/shared/TestDisplay.js b/resources/js/vue/components/shared/TestDisplay.js
index 4a78b8d055..584f277e44 100644
--- a/resources/js/vue/components/shared/TestDisplay.js
+++ b/resources/js/vue/components/shared/TestDisplay.js
@@ -21,14 +21,14 @@ export function testStatusToColorClass(status, details = '') {
   }
 
   switch (status) {
-  case 'PASSED':
-    return 'normal';
-  case 'FAILED':
-    return 'error';
-  case 'NOT_RUN':
-    return 'warning';
-  default:
-    return '';
+    case 'PASSED':
+      return 'normal';
+    case 'FAILED':
+      return 'error';
+    case 'NOT_RUN':
+      return 'warning';
+    default:
+      return '';
   }
 }
 
@@ -38,13 +38,13 @@ export function testStatusToColorClass(status, details = '') {
  */
 export function testStatusToTextColorClass(status, details = '') {
   switch (testStatusToColorClass(status, details)) {
-  case 'normal':
-    return 'normal-text';
-  case 'warning':
-    return 'warning-text';
-  case 'error':
-    return 'error-text';
-  default:
-    return '';
+    case 'normal':
+      return 'normal-text';
+    case 'warning':
+      return 'warning-text';
+    case 'error':
+      return 'error-text';
+    default:
+      return '';
   }
 }

From 2d177bc6e071852ccb3a86f60bb94caadc1a679b Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Fri, 7 Aug 2026 12:07:55 -0400
Subject: [PATCH 04/11] Refactor not-run tests warning count logic

This commit simplifies the `notRunTestsWarningCount` method in the Build model by using a more efficient query to count not-run tests that do not have details marked as "Disabled". Additionally, the API response in the Index controller is updated to reflect the new method signature. Unused test methods in the TestDisplayTest class have been removed to clean up the codebase.
---
 app/Models/Build.php                   | 15 +++++++--------
 app/cdash/app/Controller/Api/Index.php |  2 +-
 tests/Unit/Utils/TestDisplayTest.php   |  5 -----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/Models/Build.php b/app/Models/Build.php
index 6d856f9e4f..d1943953ab 100644
--- a/app/Models/Build.php
+++ b/app/Models/Build.php
@@ -407,13 +407,12 @@ public function percentCoverageForPath(string $path): ?float
      */
     public function notRunTestsWarningCount(): int
     {
-        $count = 0;
-        foreach ($this->tests()->where('status', Test::NOTRUN)->pluck('details') as $details) {
-            if (!TestDisplay::isAcceptableNotRun($details)) {
-                $count++;
-            }
-        }
-
-        return $count;
+        return $this->tests()
+            ->where('status', Test::NOTRUN)
+            ->where(static function (Builder $query): void {
+                $query->whereNull('details')
+                    ->orWhere('details', '!=', TestDisplay::DISABLED_DETAILS);
+            })
+            ->count();
     }
 }
diff --git a/app/cdash/app/Controller/Api/Index.php b/app/cdash/app/Controller/Api/Index.php
index 7542f771bf..ebd70ae7c9 100644
--- a/app/cdash/app/Controller/Api/Index.php
+++ b/app/cdash/app/Controller/Api/Index.php
@@ -1099,7 +1099,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
             }
 
             $test_response['notrun'] = $nnotrun;
-            $test_response['notrunwarning'] = $this->computeNotRunTestsWarningCount((int) $buildid, $nnotrun);
+            $test_response['notrunwarning'] = $this->computeNotRunTestsWarningCount($buildid, $nnotrun);
             $test_response['fail'] = $nfail;
             $test_response['pass'] = $npass;
 
diff --git a/tests/Unit/Utils/TestDisplayTest.php b/tests/Unit/Utils/TestDisplayTest.php
index feeeee1f71..c01b9dc196 100644
--- a/tests/Unit/Utils/TestDisplayTest.php
+++ b/tests/Unit/Utils/TestDisplayTest.php
@@ -57,9 +57,4 @@ public static function statusColorClassCases(): array
             [Test::NOTRUN, 'skipped', 'warning'],
         ];
     }
-
-    public function testDisabledDetailsConstant(): void
-    {
-        self::assertSame('Disabled', TestDisplay::DISABLED_DETAILS);
-    }
 }

From c52f0af5d04a8f1070bfd538288aca09387fb147 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 25 Aug 2026 15:04:21 -0400
Subject: [PATCH 05/11] Move not-run test display logic onto the Test model

Replace the App\Utils\TestDisplay helper with a notRunWarning() query scope
on the Test model, so the "Disabled" completion status is interpreted in one
place next to the data it describes. The status color class is derived
directly from the existing Test::DISABLED constant where it is needed, and
the unused text/GraphQL color class helpers are dropped.
---
 app/Models/Build.php                        | 11 +---
 app/Models/Test.php                         | 18 +++++++
 app/Utils/TestDisplay.php                   | 54 -------------------
 app/cdash/app/Controller/Api/QueryTests.php |  7 +--
 tests/Unit/Utils/TestDisplayTest.php        | 60 ---------------------
 5 files changed, 22 insertions(+), 128 deletions(-)
 delete mode 100644 app/Utils/TestDisplay.php
 delete mode 100644 tests/Unit/Utils/TestDisplayTest.php

diff --git a/app/Models/Build.php b/app/Models/Build.php
index d1943953ab..e2497ceed8 100644
--- a/app/Models/Build.php
+++ b/app/Models/Build.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Utils\TestDisplay;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -403,16 +402,10 @@ public function percentCoverageForPath(string $path): ?float
     }
 
     /**
-     * The number of not-run tests whose details are not "Disabled".
+     * The number of not-run tests which were not explicitly disabled.
      */
     public function notRunTestsWarningCount(): int
     {
-        return $this->tests()
-            ->where('status', Test::NOTRUN)
-            ->where(static function (Builder $query): void {
-                $query->whereNull('details')
-                    ->orWhere('details', '!=', TestDisplay::DISABLED_DETAILS);
-            })
-            ->count();
+        return $this->tests()->notRunWarning()->count();
     }
 }
diff --git a/app/Models/Test.php b/app/Models/Test.php
index a89eb00a3c..578230e89c 100644
--- a/app/Models/Test.php
+++ b/app/Models/Test.php
@@ -32,6 +32,8 @@
  * @property ?Carbon $starttime
  * @property TestTimeStatusCategory $timestatuscategory
  *
+ * @method static Builder<Test> notRunWarning()
+ *
  * @mixin Builder<Test>
  */
 class Test extends Model
@@ -84,6 +86,22 @@ class Test extends Model
         'starttime' => 'datetime',
     ];
 
+    /**
+     * Tests which did not run for a reason other than being explicitly disabled.
+     *
+     * CTest reports a completion status of "Disabled" for tests marked DISABLED.
+     *
+     * @param Builder<self> $query
+     */
+    public function scopeNotRunWarning(Builder $query): void
+    {
+        $query->where('status', self::NOTRUN)
+            ->where(static function (Builder $query): void {
+                $query->whereNull('details')
+                    ->orWhere('details', '!=', self::DISABLED);
+            });
+    }
+
     /**
      * @return BelongsTo<Build, $this>
      */
diff --git a/app/Utils/TestDisplay.php b/app/Utils/TestDisplay.php
deleted file mode 100644
index f1bb526307..0000000000
--- a/app/Utils/TestDisplay.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Utils;
-
-use App\Models\Test;
-
-final class TestDisplay
-{
-    /**
-     * CTest sets Details="Disabled" for tests marked DISABLED.
-     */
-    public const DISABLED_DETAILS = 'Disabled';
-
-    public static function isAcceptableNotRun(?string $details): bool
-    {
-        return $details === self::DISABLED_DETAILS;
-    }
-
-    public static function statusColorClass(string $status, ?string $details): string
-    {
-        if ($status === Test::NOTRUN && self::isAcceptableNotRun($details)) {
-            return 'normal';
-        }
-
-        return match ($status) {
-            Test::PASSED => 'normal',
-            Test::FAILED => 'error',
-            Test::NOTRUN => 'warning',
-            default => '',
-        };
-    }
-
-    public static function statusTextColorClass(string $status, ?string $details): string
-    {
-        return match (self::statusColorClass($status, $details)) {
-            'normal' => 'normal-text',
-            'warning' => 'warning-text',
-            'error' => 'error-text',
-            default => '',
-        };
-    }
-
-    public static function graphqlStatusColorClass(string $status, ?string $details): string
-    {
-        $dbStatus = match ($status) {
-            'NOT_RUN' => Test::NOTRUN,
-            'PASSED' => Test::PASSED,
-            'FAILED' => Test::FAILED,
-            default => strtolower($status),
-        };
-
-        return self::statusColorClass($dbStatus, $details);
-    }
-}
diff --git a/app/cdash/app/Controller/Api/QueryTests.php b/app/cdash/app/Controller/Api/QueryTests.php
index e82746126c..19a58a9963 100644
--- a/app/cdash/app/Controller/Api/QueryTests.php
+++ b/app/cdash/app/Controller/Api/QueryTests.php
@@ -19,8 +19,8 @@
 
 use App\Models\PinnedTestMeasurement;
 use App\Models\Project as EloquentProject;
+use App\Models\Test;
 use App\Models\TestMeasurement;
-use App\Utils\TestDisplay;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\Project;
@@ -424,10 +424,7 @@ public function getResponse(): array
 
                 case 'notrun':
                     $test['status'] = 'Not Run';
-                    $test['statusclass'] = TestDisplay::statusColorClass(
-                        'notrun',
-                        $row->details,
-                    );
+                    $test['statusclass'] = $row->details === Test::DISABLED ? 'normal' : 'warning';
                     break;
             }
 
diff --git a/tests/Unit/Utils/TestDisplayTest.php b/tests/Unit/Utils/TestDisplayTest.php
deleted file mode 100644
index c01b9dc196..0000000000
--- a/tests/Unit/Utils/TestDisplayTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Tests\Unit\Utils;
-
-use App\Models\Test;
-use App\Utils\TestDisplay;
-use PHPUnit\Framework\Attributes\DataProvider;
-use Tests\TestCase;
-
-class TestDisplayTest extends TestCase
-{
-    #[DataProvider('isAcceptableNotRunCases')]
-    public function testIsAcceptableNotRun(?string $details, bool $expected): void
-    {
-        self::assertSame($expected, TestDisplay::isAcceptableNotRun($details));
-    }
-
-    /**
-     * @return list<array{?string, bool}>
-     */
-    public static function isAcceptableNotRunCases(): array
-    {
-        return [
-            ['Disabled', true],
-            ['disabled', false],
-            ['DISABLED', false],
-            ['Test Disabled', false],
-            ['Disabled test', false],
-            ['Skipped', false],
-            ['', false],
-            [null, false],
-        ];
-    }
-
-    #[DataProvider('statusColorClassCases')]
-    public function testStatusColorClass(
-        string $status,
-        ?string $details,
-        string $expected,
-    ): void {
-        self::assertSame(
-            $expected,
-            TestDisplay::statusColorClass($status, $details),
-        );
-    }
-
-    /**
-     * @return list<array{string, ?string, string}>
-     */
-    public static function statusColorClassCases(): array
-    {
-        return [
-            [Test::PASSED, null, 'normal'],
-            [Test::FAILED, null, 'error'],
-            [Test::NOTRUN, 'Some reason', 'warning'],
-            [Test::NOTRUN, 'Disabled', 'normal'],
-            [Test::NOTRUN, 'skipped', 'warning'],
-        ];
-    }
-}

From fa268d7f671065cd543887a4544517e22ea3abe4 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 25 Aug 2026 15:08:00 -0400
Subject: [PATCH 06/11] Store the not-run test warning count on the build table

Counting every test of every build was only viable for small instances,
since the index page renders many builds at once.  Record the number of
not-run tests worth warning about in a new build.testnotrunwarning column
as test results are submitted, and read that column instead, so the index
page cost no longer scales with the number of tests.
---
 app/Models/Build.php                          | 11 ++--
 app/cdash/app/Controller/Api/Index.php        | 30 +++++------
 app/cdash/app/Model/Build.php                 | 25 +++++++--
 ...6_08_25_184512_build_testnotrunwarning.php | 53 +++++++++++++++++++
 graphql/schema.graphql                        |  4 +-
 tests/Feature/GraphQL/BuildTypeTest.php       | 26 +--------
 tests/Feature/Submission/Test/TestXMLTest.php | 30 +++++++++++
 .../Test/data/disabled_and_not_run.xml        | 51 ++++++++++++++++++
 8 files changed, 177 insertions(+), 53 deletions(-)
 create mode 100644 database/migrations/2026_08_25_184512_build_testnotrunwarning.php
 create mode 100644 tests/Feature/Submission/Test/data/disabled_and_not_run.xml

diff --git a/app/Models/Build.php b/app/Models/Build.php
index e2497ceed8..c45518ef3f 100644
--- a/app/Models/Build.php
+++ b/app/Models/Build.php
@@ -33,6 +33,7 @@
  * @property int $buildwarnings
  * @property int $buildduration
  * @property int $testnotrun
+ * @property int $testnotrunwarning
  * @property int $testfailed
  * @property int $testpassed
  * @property int $testtimestatusfailed
@@ -84,6 +85,7 @@ class Build extends Model
         'buildwarnings',
         'buildduration',
         'testnotrun',
+        'testnotrunwarning',
         'testfailed',
         'testpassed',
         'testtimestatusfailed',
@@ -118,6 +120,7 @@ class Build extends Model
         'buildwarnings' => 'integer',
         'buildduration' => 'integer',
         'testnotrun' => 'integer',
+        'testnotrunwarning' => 'integer',
         'testfailed' => 'integer',
         'testpassed' => 'integer',
         'testduration' => 'integer',
@@ -400,12 +403,4 @@ public function percentCoverageForPath(string $path): ?float
 
         return ($loctested / $total_lines) * 100;
     }
-
-    /**
-     * The number of not-run tests which were not explicitly disabled.
-     */
-    public function notRunTestsWarningCount(): int
-    {
-        return $this->tests()->notRunWarning()->count();
-    }
 }
diff --git a/app/cdash/app/Controller/Api/Index.php b/app/cdash/app/Controller/Api/Index.php
index ebd70ae7c9..37662aa2c3 100644
--- a/app/cdash/app/Controller/Api/Index.php
+++ b/app/cdash/app/Controller/Api/Index.php
@@ -17,7 +17,7 @@
 
 namespace CDash\Controller\Api;
 
-use App\Models\Build as EloquentBuild;
+use App\Models\Test;
 use App\Utils\TestingDay;
 use CDash\Database;
 use CDash\Model\BuildGroup;
@@ -346,6 +346,7 @@ public function getIndexSelect(): string
                 b.buildwarnings AS countbuildwarnings,
                 b.buildduration,
                 b.testnotrun AS counttestsnotrun,
+                b.testnotrunwarning AS counttestsnotrunwarning,
                 b.testfailed AS counttestsfailed,
                 b.testpassed AS counttestspassed,
                 b.testtimestatusfailed AS countteststimestatusfailed,
@@ -657,6 +658,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
         $selected_build_warnings = 0;
         $selected_build_duration = 0;
         $selected_tests_not_run = 0;
+        $selected_tests_not_run_warning = 0;
         $selected_tests_failed = 0;
         $selected_tests_passed = 0;
         $selected_proc_time = 0;
@@ -686,6 +688,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
                                           b.starttime,
                                           b.endtime,
                                           testnotrun,
+                                          testnotrunwarning,
                                           testfailed,
                                           testpassed,
                                           testduration,
@@ -706,6 +709,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
                     $selected_build_warnings += max(0, $select_array->buildwarnings);
                     $selected_build_duration += max(0, $select_array->buildduration);
                     $selected_tests_not_run += max(0, $select_array->testnotrun);
+                    $selected_tests_not_run_warning += max(0, $select_array->testnotrunwarning);
                     $selected_tests_failed += max(0, $select_array->testfailed);
                     $selected_tests_passed += max(0, $select_array->testpassed);
                     $selected_proc_time += max(0, $select_array->testtime);
@@ -1014,6 +1018,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
             $test_response = [];
 
             $nnotrun = $build_array['counttestsnotrun'];
+            $nnotrunwarning = $build_array['counttestsnotrunwarning'];
             $nfail = $build_array['counttestsfailed'];
             $npass = $build_array['counttestspassed'];
             $proc_time = $build_array['testtime'];
@@ -1023,11 +1028,13 @@ public function generateBuildResponseFromRow(array $build_array): array|false
             if (!$this->childView) {
                 if ($this->includeSubProjects) {
                     $nnotrun = $selected_tests_not_run;
+                    $nnotrunwarning = $selected_tests_not_run_warning;
                     $nfail = $selected_tests_failed;
                     $npass = $selected_tests_passed;
                     $proc_time = $selected_proc_time;
                 } else {
                     $nnotrun -= $selected_tests_not_run;
+                    $nnotrunwarning -= $selected_tests_not_run_warning;
                     $nfail -= $selected_tests_failed;
                     $npass -= $selected_tests_passed;
                     $proc_time -= $selected_proc_time;
@@ -1056,7 +1063,8 @@ public function generateBuildResponseFromRow(array $build_array): array|false
                 $labels_result = DB::select("
                                      SELECT
                                          b2t.status,
-                                         b2t.newstatus
+                                         b2t.newstatus,
+                                         b2t.details
                                      FROM build2test AS b2t
                                      INNER JOIN label2test AS l2t ON l2t.testid = b2t.id
                                      WHERE
@@ -1066,6 +1074,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
                                  ", array_merge([$buildid], $this->labelIds));
 
                 $nnotrun = 0;
+                $nnotrunwarning = 0;
                 $nfail = 0;
                 $npass = 0;
                 $test_response['nfaildiffp'] = 0;
@@ -1090,6 +1099,9 @@ public function generateBuildResponseFromRow(array $build_array): array|false
                             break;
                         case 'notrun':
                             $nnotrun++;
+                            if ($label_row->details !== Test::DISABLED) {
+                                $nnotrunwarning++;
+                            }
                             if ((int) $label_row->newstatus === 1) {
                                 $test_response['nnotrundiffp']++;
                             }
@@ -1099,7 +1111,7 @@ public function generateBuildResponseFromRow(array $build_array): array|false
             }
 
             $test_response['notrun'] = $nnotrun;
-            $test_response['notrunwarning'] = $this->computeNotRunTestsWarningCount($buildid, $nnotrun);
+            $test_response['notrunwarning'] = max(0, $nnotrunwarning);
             $test_response['fail'] = $nfail;
             $test_response['pass'] = $npass;
 
@@ -1557,16 +1569,4 @@ public function recordGenerationTime(array &$response): void
     {
         $this->pageTimer->end($response);
     }
-
-    /**
-     * Count not-run tests that should display as warnings on the index page.
-     */
-    private function computeNotRunTestsWarningCount(int $buildid, int $notRunCount): int
-    {
-        if ($notRunCount <= 0) {
-            return 0;
-        }
-
-        return EloquentBuild::find($buildid)?->notRunTestsWarningCount() ?? 0;
-    }
 }
diff --git a/app/cdash/app/Model/Build.php b/app/cdash/app/Model/Build.php
index cd07084685..a3abe649ea 100644
--- a/app/cdash/app/Model/Build.php
+++ b/app/cdash/app/Model/Build.php
@@ -773,7 +773,7 @@ public function Save()
     /** Helper function for test number accessors. */
     private function GetNumberOfTestsByField(string $field): int
     {
-        if (!in_array($field, ['testpassed', 'testfailed', 'testnotrun'], true)) {
+        if (!in_array($field, ['testpassed', 'testfailed', 'testnotrun', 'testnotrunwarning'], true)) {
             throw new InvalidArgumentException('Invalid field specified.');
         }
 
@@ -799,20 +799,35 @@ public function GetNumberOfNotRunTests(): int|false
         return $this->GetNumberOfTestsByField('testnotrun');
     }
 
+    /** Get number of not run tests which were not explicitly disabled */
+    public function GetNumberOfNotRunWarningTests(): int|false
+    {
+        return $this->GetNumberOfTestsByField('testnotrunwarning');
+    }
+
     /** Update the test numbers */
     public function UpdateTestNumbers(int $numberTestsPassed, int $numberTestsFailed, int $numberTestsNotRun): void
     {
         $this->TestFailedCount = $numberTestsFailed;
 
+        // Disabled tests aren't worth warning about, so they are tallied separately from
+        // the other not-run tests.  The tests for this build have all been recorded by
+        // now, so they can be counted directly.
+        $numberTestsNotRunWarning = Test::where('buildid', (int) $this->Id)
+            ->notRunWarning()
+            ->count();
+
         // If this is a subproject build, we also have to update its parents test numbers.
         $newFailed = $numberTestsFailed - $this->GetNumberOfFailedTests();
         $newNotRun = $numberTestsNotRun - $this->GetNumberOfNotRunTests();
         $newPassed = $numberTestsPassed - $this->GetNumberOfPassedTests();
+        $newNotRunWarning = $numberTestsNotRunWarning - $this->GetNumberOfNotRunWarningTests();
         $this->SetParentId($this->LookupParentBuildId());
-        $this->UpdateParentTestNumbers($newFailed, $newNotRun, $newPassed);
+        $this->UpdateParentTestNumbers($newFailed, $newNotRun, $newPassed, $newNotRunWarning);
 
         EloquentBuild::whereKey($this->Id)->update([
             'testnotrun' => $numberTestsNotRun,
+            'testnotrunwarning' => $numberTestsNotRunWarning,
             'testfailed' => $numberTestsFailed,
             'testpassed' => $numberTestsPassed,
         ]);
@@ -1612,22 +1627,24 @@ public function UpdateBuild($buildid, $newErrors, $newWarnings): void
     }
 
     /** Update the testing numbers for our parent build. */
-    private function UpdateParentTestNumbers(int $newFailed, int $newNotRun, int $newPassed): void
+    private function UpdateParentTestNumbers(int $newFailed, int $newNotRun, int $newPassed, int $newNotRunWarning): void
     {
         if ($this->ParentId < 1) {
             return;
         }
 
-        DB::transaction(function () use ($newFailed, $newNotRun, $newPassed): void {
+        DB::transaction(function () use ($newFailed, $newNotRun, $newPassed, $newNotRunWarning): void {
             $parent = EloquentBuild::findOrFail($this->ParentId);
 
             // Don't let the -1 default value screw up our math.
             $parent_testfailed = self::ConvertMissingToZero($parent->testfailed);
             $parent_testnotrun = self::ConvertMissingToZero($parent->testnotrun);
+            $parent_testnotrunwarning = self::ConvertMissingToZero($parent->testnotrunwarning);
             $parent_testpassed = self::ConvertMissingToZero($parent->testpassed);
 
             $parent->update([
                 'testnotrun' => $newNotRun + $parent_testnotrun,
+                'testnotrunwarning' => $newNotRunWarning + $parent_testnotrunwarning,
                 'testfailed' => $newFailed + $parent_testfailed,
                 'testpassed' => $newPassed + $parent_testpassed,
             ]);
diff --git a/database/migrations/2026_08_25_184512_build_testnotrunwarning.php b/database/migrations/2026_08_25_184512_build_testnotrunwarning.php
new file mode 100644
index 0000000000..92c9d67f96
--- /dev/null
+++ b/database/migrations/2026_08_25_184512_build_testnotrunwarning.php
@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::statement("ALTER TABLE build ADD COLUMN testnotrunwarning smallint DEFAULT '-1'::smallint");
+
+        // Builds which reported test results have no warnings until proven otherwise.
+        DB::update('UPDATE build SET testnotrunwarning = 0 WHERE testnotrun >= 0');
+
+        DB::update("
+            UPDATE build
+            SET testnotrunwarning = counted.total
+            FROM (
+                SELECT buildid, COUNT(*) AS total
+                FROM build2test
+                WHERE status = 'notrun'
+                    AND (details IS NULL OR details != 'Disabled')
+                GROUP BY buildid
+            ) AS counted
+            WHERE build.id = counted.buildid
+        ");
+
+        // Parent builds aggregate the results of their children.
+        DB::update("
+            UPDATE build
+            SET testnotrunwarning = GREATEST(build.testnotrunwarning, 0) + counted.total
+            FROM (
+                SELECT child.parentid, COUNT(*) AS total
+                FROM build2test
+                INNER JOIN build AS child ON child.id = build2test.buildid
+                WHERE child.parentid > 0
+                    AND build2test.status = 'notrun'
+                    AND (build2test.details IS NULL OR build2test.details != 'Disabled')
+                GROUP BY child.parentid
+            ) AS counted
+            WHERE build.id = counted.parentid
+        ");
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+    }
+};
diff --git a/graphql/schema.graphql b/graphql/schema.graphql
index 1ae17527b8..89955af855 100644
--- a/graphql/schema.graphql
+++ b/graphql/schema.graphql
@@ -857,9 +857,9 @@ type Build {
   notRunTestsCount: Int @rename(attribute: "testnotrun")
 
   """
-  The number of not-run tests counted as warnings (excludes tests whose details are "Disabled").
+  The number of not-run tests counted as warnings (excludes tests which were explicitly disabled).
   """
-  notRunTestsWarningCount: Int! @method(name: "notRunTestsWarningCount")
+  notRunTestsWarningCount: Int @rename(attribute: "testnotrunwarning")
 
   "The duration of the test step in seconds."
   testDuration: Int! @rename(attribute: "testduration")
diff --git a/tests/Feature/GraphQL/BuildTypeTest.php b/tests/Feature/GraphQL/BuildTypeTest.php
index 32e938be53..b8bf4d6ada 100644
--- a/tests/Feature/GraphQL/BuildTypeTest.php
+++ b/tests/Feature/GraphQL/BuildTypeTest.php
@@ -10,7 +10,6 @@
 use App\Models\Label;
 use App\Models\Project;
 use App\Models\Target;
-use App\Models\TestOutput;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
@@ -653,33 +652,14 @@ public function testPercentCoverageForPath(string $path, ?float $expected_percen
         ]);
     }
 
-    public function testNotRunTestsWarningCountExcludesDisabledDetails(): void
+    public function testNotRunTestsWarningCount(): void
     {
-        $output = TestOutput::create([
-            'path' => 'a',
-            'command' => 'b',
-            'output' => 'c',
-        ]);
-
         /** @var Build $build */
         $build = $this->project->builds()->create([
             'name' => 'build-with-disabled-tests',
             'uuid' => Str::uuid()->toString(),
             'testnotrun' => 2,
-        ]);
-
-        $build->tests()->create([
-            'testname' => 'disabled_test',
-            'status' => 'notrun',
-            'details' => 'Disabled',
-            'outputid' => $output->id,
-        ]);
-
-        $build->tests()->create([
-            'testname' => 'missing_test',
-            'status' => 'notrun',
-            'details' => 'Unable to find executable',
-            'outputid' => $output->id,
+            'testnotrunwarning' => 1,
         ]);
 
         $this->graphQL('
@@ -699,7 +679,5 @@ public function testNotRunTestsWarningCountExcludesDisabledDetails(): void
                 ],
             ],
         ]);
-
-        $output->delete();
     }
 }
diff --git a/tests/Feature/Submission/Test/TestXMLTest.php b/tests/Feature/Submission/Test/TestXMLTest.php
index d83c8dce9b..0337ebdf3b 100644
--- a/tests/Feature/Submission/Test/TestXMLTest.php
+++ b/tests/Feature/Submission/Test/TestXMLTest.php
@@ -114,6 +114,36 @@ public function testNonUTF8Output(): void
         ]);
     }
 
+    /**
+     * Disabled tests are recorded as not run, but they are not worth warning about.
+     */
+    public function testNotRunWarningCount(): void
+    {
+        $this->submitFiles($this->project->name, [
+            base_path(
+                'tests/Feature/Submission/Test/data/disabled_and_not_run.xml'
+            ),
+        ]);
+
+        $this->graphQL('
+            query build($id: ID) {
+              build(id: $id) {
+                notRunTestsCount
+                notRunTestsWarningCount
+              }
+            }
+        ', [
+            'id' => $this->project->builds()->firstOrFail()->id,
+        ])->assertExactJson([
+            'data' => [
+                'build' => [
+                    'notRunTestsCount' => 2,
+                    'notRunTestsWarningCount' => 1,
+                ],
+            ],
+        ]);
+    }
+
     /**
      * Test parsing a valid Test.xml file that contains the StartTestTime
      * attribute for each Test entry in the test output.
diff --git a/tests/Feature/Submission/Test/data/disabled_and_not_run.xml b/tests/Feature/Submission/Test/data/disabled_and_not_run.xml
new file mode 100644
index 0000000000..d58902ecd6
--- /dev/null
+++ b/tests/Feature/Submission/Test/data/disabled_and_not_run.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Site BuildName="dummy_test_name"
+  BuildStamp="dummy_stamp"
+  Name="dummy_name"
+	>
+	<Testing>
+		<StartDateTime>Feb 13 13:03 EST</StartDateTime>
+		<StartTestTime>1771005834</StartTestTime>
+		<TestList>
+			<Test>./disabled</Test>
+			<Test>./missing</Test>
+		</TestList>
+		<Test Status="notrun">
+			<Name>disabled</Name>
+			<Path>.</Path>
+			<FullName>./disabled</FullName>
+			<FullCommandLine></FullCommandLine>
+			<Results>
+				<NamedMeasurement type="text/string" name="Completion Status">
+					<Value>Disabled</Value>
+				</NamedMeasurement>
+				<NamedMeasurement type="text/string" name="Command Line">
+					<Value></Value>
+				</NamedMeasurement>
+				<Measurement>
+					<Value></Value>
+				</Measurement>
+			</Results>
+		</Test>
+		<Test Status="notrun">
+			<Name>missing</Name>
+			<Path>.</Path>
+			<FullName>./missing</FullName>
+			<FullCommandLine></FullCommandLine>
+			<Results>
+				<NamedMeasurement type="text/string" name="Completion Status">
+					<Value>Unable to find executable</Value>
+				</NamedMeasurement>
+				<NamedMeasurement type="text/string" name="Command Line">
+					<Value></Value>
+				</NamedMeasurement>
+				<Measurement>
+					<Value></Value>
+				</Measurement>
+			</Results>
+		</Test>
+		<EndDateTime>Feb 13 13:03 EST</EndDateTime>
+		<EndTestTime>1771005835</EndTestTime>
+		<ElapsedMinutes>0</ElapsedMinutes>
+	</Testing>
+</Site>

From 4fed44cb85054980e4e3c3c57036aee4b24b4bc3 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 25 Aug 2026 15:08:15 -0400
Subject: [PATCH 07/11] Drop the project settings anchor support

Nothing links to a specific settings section now that the not-run details
are matched without a per-project option, so the anchor prop on FormSection
and the hash navigation it existed for are unused.
---
 .../components/ProjectSettings/GeneralTab.vue   |  3 +--
 .../js/vue/components/ProjectSettingsPage.vue   | 17 -----------------
 .../js/vue/components/shared/FormSection.vue    | 11 +----------
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/resources/js/vue/components/ProjectSettings/GeneralTab.vue b/resources/js/vue/components/ProjectSettings/GeneralTab.vue
index 48a6838793..2e68a274c6 100644
--- a/resources/js/vue/components/ProjectSettings/GeneralTab.vue
+++ b/resources/js/vue/components/ProjectSettings/GeneralTab.vue
@@ -362,8 +362,7 @@
       </FormSection>
 
       <FormSection
-        title="Testing"
-        section-id="Testing"
+        title="Tests"
       >
         <CheckboxField
           v-model="form.enableTestTiming"
diff --git a/resources/js/vue/components/ProjectSettingsPage.vue b/resources/js/vue/components/ProjectSettingsPage.vue
index eeb4012426..66a6d89bc7 100644
--- a/resources/js/vue/components/ProjectSettingsPage.vue
+++ b/resources/js/vue/components/ProjectSettingsPage.vue
@@ -97,22 +97,5 @@ export default {
       currentSection: 'general',
     };
   },
-
-  mounted() {
-    this.navigateToHashSection();
-  },
-
-  methods: {
-    navigateToHashSection() {
-      if (window.location.hash !== '#Testing') {
-        return;
-      }
-
-      this.currentSection = 'general';
-      this.$nextTick(() => {
-        document.getElementById('Testing')?.scrollIntoView();
-      });
-    },
-  },
 };
 </script>
diff --git a/resources/js/vue/components/shared/FormSection.vue b/resources/js/vue/components/shared/FormSection.vue
index 3061ef9487..c95a864cb6 100644
--- a/resources/js/vue/components/shared/FormSection.vue
+++ b/resources/js/vue/components/shared/FormSection.vue
@@ -1,8 +1,5 @@
 <template>
-  <section
-    :id="sectionId"
-    class="tw-container tw-mx-auto"
-  >
+  <section class="tw-container tw-mx-auto">
     <h4 class="tw-text-xl tw-font-semibold tw-border-b tw-pb-2 tw-mb-2">
       {{ title }}
     </h4>
@@ -21,12 +18,6 @@ export default {
       type: String,
       required: true,
     },
-
-    sectionId: {
-      type: String,
-      required: false,
-      default: null,
-    },
   },
 };
 </script>

From 182ac7424f5b2a53a9f3b43fd26aff6ae206da79 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 25 Aug 2026 15:30:58 -0400
Subject: [PATCH 08/11] Remove unused testStatusToTextColorClass helper

The text-color mapping was leftover from the old PHP TestDisplay utility
and is not imported anywhere in the Vue UI.
---
 .../js/vue/components/shared/TestDisplay.js     | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/resources/js/vue/components/shared/TestDisplay.js b/resources/js/vue/components/shared/TestDisplay.js
index 584f277e44..63f2e1209d 100644
--- a/resources/js/vue/components/shared/TestDisplay.js
+++ b/resources/js/vue/components/shared/TestDisplay.js
@@ -31,20 +31,3 @@ export function testStatusToColorClass(status, details = '') {
       return '';
   }
 }
-
-/**
- * @param {string} status
- * @param {string} details
- */
-export function testStatusToTextColorClass(status, details = '') {
-  switch (testStatusToColorClass(status, details)) {
-    case 'normal':
-      return 'normal-text';
-    case 'warning':
-      return 'warning-text';
-    case 'error':
-      return 'error-text';
-    default:
-      return '';
-  }
-}

From a887248f2a7cc848bba5d2848c6d26f38bd5ad14 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 25 Aug 2026 16:02:29 -0400
Subject: [PATCH 09/11] Treat disabled tests as success on the build timeline

Master moved the configure/build/test status colors onto BuildTimelineCard.
Use notRunTestsWarningCount there so tests whose details are "Disabled" do
not turn the Test step orange.
---
 .../js/vue/components/BuildSummaryPage/BuildTimelineCard.vue   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/vue/components/BuildSummaryPage/BuildTimelineCard.vue b/resources/js/vue/components/BuildSummaryPage/BuildTimelineCard.vue
index f09dbc5516..1ada74a51c 100644
--- a/resources/js/vue/components/BuildSummaryPage/BuildTimelineCard.vue
+++ b/resources/js/vue/components/BuildSummaryPage/BuildTimelineCard.vue
@@ -201,6 +201,7 @@ export default {
             buildWarningsCount
             failedTestsCount
             notRunTestsCount
+            notRunTestsWarningCount
             passedTestsCount
           }
         }
@@ -278,7 +279,7 @@ export default {
       if (this.build.failedTestsCount > 0) {
         return 'error';
       }
-      if (this.build.notRunTestsCount > 0) {
+      if (this.build.notRunTestsWarningCount > 0) {
         return 'warning';
       }
       return 'success';

From b9c4717f3e6e8abf37d4b263640a8181906516e8 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Tue, 1 Sep 2026 07:33:52 -0400
Subject: [PATCH 10/11] Fix baseline phpstan

---
 phpstan-baseline.neon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 8e1ac63409..383b3d8860 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -7848,7 +7848,7 @@ parameters:
 		-
 			rawMessage: 'Only numeric types are allowed in -, int|false given on the right side.'
 			identifier: minus.rightNonNumeric
-			count: 3
+			count: 4
 			path: app/cdash/app/Model/Build.php
 
 		-

From 28c2cedd899aab4cd73495ebcbf54605918df196 Mon Sep 17 00:00:00 2001
From: Julien Jomier <jjomier@nvidia.com>
Date: Wed, 2 Sep 2026 08:50:32 -0400
Subject: [PATCH 11/11] Enhance test status handling and data attributes

This commit updates the Build model to ensure the count of not-run tests with warnings is correctly handled, defaulting to zero when no tests are found. In the Vue components, a new `testId` attribute is added for better identification of test statuses, and the DataTable component is modified to conditionally set the `data-test` attribute based on the presence of this new attribute. Additionally, the BuildTypeTest is updated to include the `notRunTestsWarningCount` in the GraphQL response, ensuring accurate data representation in tests.
---
 app/cdash/app/Model/Build.php                 |  5 +--
 .../js/vue/components/BuildTestsPage.vue      |  1 +
 .../js/vue/components/shared/DataTable.vue    |  3 +-
 tests/Browser/Pages/BuildTestsPageTest.php    | 16 +++-------
 tests/Feature/GraphQL/BuildTypeTest.php       | 32 ++-----------------
 5 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/app/cdash/app/Model/Build.php b/app/cdash/app/Model/Build.php
index a3abe649ea..206d1006b1 100644
--- a/app/cdash/app/Model/Build.php
+++ b/app/cdash/app/Model/Build.php
@@ -813,9 +813,10 @@ public function UpdateTestNumbers(int $numberTestsPassed, int $numberTestsFailed
         // Disabled tests aren't worth warning about, so they are tallied separately from
         // the other not-run tests.  The tests for this build have all been recorded by
         // now, so they can be counted directly.
-        $numberTestsNotRunWarning = Test::where('buildid', (int) $this->Id)
+        $numberTestsNotRunWarning = EloquentBuild::find((int) $this->Id)
+            ?->tests()
             ->notRunWarning()
-            ->count();
+            ->count() ?? 0;
 
         // If this is a subproject build, we also have to update its parents test numbers.
         $newFailed = $numberTestsFailed - $this->GetNumberOfFailedTests();
diff --git a/resources/js/vue/components/BuildTestsPage.vue b/resources/js/vue/components/BuildTestsPage.vue
index 0484367b46..1242aae130 100644
--- a/resources/js/vue/components/BuildTestsPage.vue
+++ b/resources/js/vue/components/BuildTestsPage.vue
@@ -327,6 +327,7 @@ export default {
             text: this.humanReadableTestStatus(edge.node.status),
             href: `${this.$baseURL}/tests/${edge.node.id}`,
             classes: [testStatusToColorClass(edge.node.status, edge.node.details)],
+            testId: `test-status-${edge.node.id}`,
           },
           subProject: edge.subProject ?? '',
           timeStatus: {
diff --git a/resources/js/vue/components/shared/DataTable.vue b/resources/js/vue/components/shared/DataTable.vue
index a51fa1f358..ecc7e322b0 100644
--- a/resources/js/vue/components/shared/DataTable.vue
+++ b/resources/js/vue/components/shared/DataTable.vue
@@ -54,7 +54,7 @@
           :class="(row[column.name]?.classes ?? []).concat(column.expand ? [] : ['shrink'])"
           class="table-cell"
           data-cy="data-table-cell"
-          :data-test="testId + '-cell'"
+          :data-test="row[column.name]?.testId ?? (testId + '-cell')"
         >
           <!--
             Display a custom template for each table cell, or a default template
@@ -162,6 +162,7 @@ export default {
      *       text: String
      *       href: String
      *       classes: ?[String]  # A optional list of classes to be applied to the <td> element
+     *       testId: ?String     # Optional data-test attribute for the <td> element
      *   }
      *
      * Custom metadata objects can be used to provide props to custom templates passed via slots.
diff --git a/tests/Browser/Pages/BuildTestsPageTest.php b/tests/Browser/Pages/BuildTestsPageTest.php
index 4f09cc8a19..b67b76743b 100644
--- a/tests/Browser/Pages/BuildTestsPageTest.php
+++ b/tests/Browser/Pages/BuildTestsPageTest.php
@@ -549,19 +549,11 @@ public function testNotRunWithDisabledDetailsShownInGreen(): void
 
         $this->browse(function (Browser $browser) use ($disabled_not_run_test, $warning_not_run_test, $build): void {
             $browser->visit("/builds/{$build->id}/tests")
-                ->waitFor('@tests-table')
-                ->waitForText($disabled_not_run_test->testname)
+                ->waitFor("@test-status-{$disabled_not_run_test->id}")
+                ->waitFor("@test-status-{$warning_not_run_test->id}")
+                ->assertAttributeContains("@test-status-{$disabled_not_run_test->id}", 'class', 'normal')
+                ->assertAttributeContains("@test-status-{$warning_not_run_test->id}", 'class', 'warning')
             ;
-
-            self::assertTrue($browser->script(
-                'return document.querySelector(\'a[href*="/tests/' . $disabled_not_run_test->id . '"]\')'
-                . '?.closest("tr")?.querySelector("td.normal") !== null',
-            )[0]);
-
-            self::assertTrue($browser->script(
-                'return document.querySelector(\'a[href*="/tests/' . $warning_not_run_test->id . '"]\')'
-                . '?.closest("tr")?.querySelector("td.warning") !== null',
-            )[0]);
         });
     }
 }
diff --git a/tests/Feature/GraphQL/BuildTypeTest.php b/tests/Feature/GraphQL/BuildTypeTest.php
index b8bf4d6ada..14813f3612 100644
--- a/tests/Feature/GraphQL/BuildTypeTest.php
+++ b/tests/Feature/GraphQL/BuildTypeTest.php
@@ -73,6 +73,7 @@ public function testBasicFieldAccess(): void
             'buildwarnings' => 4,
             'buildduration' => 20,
             'testnotrun' => 5,
+            'testnotrunwarning' => 9,
             'testfailed' => 6,
             'testpassed' => 7,
             'testtimestatusfailed' => 8,
@@ -107,6 +108,7 @@ public function testBasicFieldAccess(): void
                                 buildWarningsCount
                                 buildDuration
                                 notRunTestsCount
+                                notRunTestsWarningCount
                                 failedTestsCount
                                 passedTestsCount
                                 timeStatusFailedTestsCount
@@ -147,6 +149,7 @@ public function testBasicFieldAccess(): void
                                     'buildWarningsCount' => 4,
                                     'buildDuration' => 20,
                                     'notRunTestsCount' => 5,
+                                    'notRunTestsWarningCount' => 9,
                                     'failedTestsCount' => 6,
                                     'passedTestsCount' => 7,
                                     'timeStatusFailedTestsCount' => 8,
@@ -651,33 +654,4 @@ public function testPercentCoverageForPath(string $path, ?float $expected_percen
             ],
         ]);
     }
-
-    public function testNotRunTestsWarningCount(): void
-    {
-        /** @var Build $build */
-        $build = $this->project->builds()->create([
-            'name' => 'build-with-disabled-tests',
-            'uuid' => Str::uuid()->toString(),
-            'testnotrun' => 2,
-            'testnotrunwarning' => 1,
-        ]);
-
-        $this->graphQL('
-            query build($id: ID!) {
-                build(id: $id) {
-                    notRunTestsCount
-                    notRunTestsWarningCount
-                }
-            }
-        ', [
-            'id' => $build->id,
-        ])->assertExactJson([
-            'data' => [
-                'build' => [
-                    'notRunTestsCount' => 2,
-                    'notRunTestsWarningCount' => 1,
-                ],
-            ],
-        ]);
-    }
 }