fix single executable plb test

brian-eaton · Dec 5, 2023 · 414935b · 414935b
1 parent eaba9ff
commit 414935b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -61,12 +61,14 @@ def buildnml(case, caseroot, compname):
     # call buildcpp to set both cppdefs and config_cache.xml file for generating namelist
     #--------------------------------------------------------------------
     call_buildcpp = False
-    if not os.path.exists(os.path.join(caseroot,"LockedFiles","env_build.xml")):
+    camconf = os.path.join(caseroot, "Buildconf", "camconf")
+    filename = os.path.join(camconf, "config_cache.xml")
+    if not os.path.isfile(filename):
         call_buildcpp = True
     else:
         file1 = os.path.join(caseroot,"env_build.xml")
         file2 = os.path.join(caseroot,"LockedFiles","env_build.xml")
-        if not filecmp.cmp(file1, file2):
+        if os.path.isfile(file2) and not filecmp.cmp(file1, file2):
             call_buildcpp = True
     if call_buildcpp:
         cmd = os.path.join(os.path.join(srcroot,"cime_config","buildcpp"))
@@ -78,8 +80,6 @@ def buildnml(case, caseroot, compname):
             raise
 
     # Verify that we have a config_cache file (generated by the call to buildcpp)
-    camconf = os.path.join(caseroot, "Buildconf", "camconf")
-    filename = os.path.join(camconf, "config_cache.xml")
     expect(os.path.isfile(filename),
            " Missing config_cache.xml - cannot run build-namelist")
 

diff --git a/cime_config/config_tests.xml b/cime_config/config_tests.xml
@@ -23,6 +23,7 @@ TMC   CAM mass conservation test
     <STOP_N>9</STOP_N>
     <HIST_OPTION>$STOP_OPTION</HIST_OPTION>
     <HIST_N>$STOP_N</HIST_N>
+    <ALLOW_SINGLE_EXE>TRUE</ALLOW_SINGLE_EXE>
   </test>
 
   <test NAME="SUB">