From 35305d25227bf4529f13cb98cb16c12caa0f170c Mon Sep 17 00:00:00 2001
From: Sam Rabin <sam.rabin@gmail.com>
Date: Fri, 13 Sep 2024 12:52:54 -0600
Subject: [PATCH] Mark SETUP as FAIL if case.cmpgen_namelists fails.

---
 CIME/test_scheduler.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CIME/test_scheduler.py b/CIME/test_scheduler.py
index bbe5efedf7b..da99dacb69b 100644
--- a/CIME/test_scheduler.py
+++ b/CIME/test_scheduler.py
@@ -1020,10 +1020,14 @@ def _setup_phase(self, test):
                 from_dir=test_dir,
                 env=env,
             )
-            expect(
-                cmdstat in [0, TESTS_FAILED_ERR_CODE],
-                "Fatal error in case.cmpgen_namelists: {}".format(output),
-            )
+            try:
+                expect(
+                    cmdstat in [0, TESTS_FAILED_ERR_CODE],
+                    "Fatal error in case.cmpgen_namelists: {}".format(output),
+                )
+            except Exception:
+                self._update_test_status_file(test, SETUP_PHASE, TEST_FAIL_STATUS)
+                raise
 
         if self._single_exe:
             with Case(self._get_test_dir(test), read_only=False) as case: