Merge Pull Request #2768 from E3SM-Project/scream/bartgol/eamxx/use-p…

…netcdf-in-tas

Automatically Merged using E3SM Pull Request AutoTester
PR Title: Add pnetcdf paths to config line when running test-all-scream
PR Author: bartgol
PR LABELS: testing, AT: AUTOMERGE, scripts, AT: Skip v1 Testing

components/eamxx/scripts/test_all_scream.py

@@ -443,6 +443,9 @@ def generate_cmake_config(self, test, for_ctest=False):
         stat, c_path, _ = run_cmd("nc-config --prefix")
         if stat == 0:
             result += f" -DNetCDF_C_PATH={c_path}"
+        stat, pc_path, _ = run_cmd("pnetcdf-config --prefix")
+        if stat == 0:
+            result += f" -DPnetCDF_C_PATH={pc_path}"
 
         # Test-specific cmake options
         for key, value in test.cmake_args:
@@ -865,6 +868,7 @@ def test_all_scream(self):
 
         finally:
             # Cleanup the repo if needed
-            cleanup_repo(self._original_branch, self._original_commit, self._has_backup_commit)
+            if self._original_commit!=get_current_commit():
+                cleanup_repo(self._original_branch, self._original_commit, self._has_backup_commit)
 
         return success