Consolidate standard flag management for coverage

Author: langmm

HISTORY.rst

@@ -2,7 +2,7 @@
 History
 =======
 
-1.8.4 (2023-01-25) Update CI to use mamba, improve dev utilities, & various bug fixes
+1.8.4 (2023-01-27) Update CI to use mamba, improve dev utilities, & various bug fixes
 ------------------
 * Update utility scripts so that requirements can be maintained in a single file with pip requirements.txt file and conda recipe generated via utils/manage_requirements.py
 * Consolidate CLI utilities for creating environments

yggdrasil/drivers/CPPModelDriver.py

@@ -34,30 +34,20 @@ def find_standard_flag(cls, flags):
         return -1
 
     @classmethod
-    def add_standard_flag(cls, flags):
-        r"""Add a standard flag to the list of flags.
+    def handle_standard_flag(cls, flags, skip_standard_flag=False):
+        r"""Add or remove standard flag from a list of flags.
 
         Args:
             flags (list): Compilation flags.
+            skip_standard_flag (bool, optional): If True, the C++
+                standard flag will not be added. Defaults to False.
 
         """
         std_flag_idx = cls.find_standard_flag(flags)
-        if std_flag_idx == -1:
-            flags.append('-std=%s' % cls.cpp_std)
-        return flags
-
-    @classmethod
-    def remove_standard_flag(cls, flags):
-        r"""Remove the standard flag from a list of flags if one is
-        present.
-
-        Args:
-            flags (list): Compilation flags.
-
-        """
-        std_flag_idx = cls.find_standard_flag(flags)
-        if std_flag_idx != -1:
+        if skip_standard_flag and (std_flag_idx != -1):
             del flags[std_flag_idx]
+        elif (not skip_standard_flag) and (std_flag_idx == -1):
+            flags.append('-std=%s' % cls.cpp_std)
         return flags
 
 
@@ -82,10 +72,7 @@ def get_flags(cls, skip_standard_flag=False, **kwargs):
         """
         out = super(GPPCompiler, cls).get_flags(**kwargs)
         # Add/remove standard library flag
-        if skip_standard_flag:
-            out = cls.remove_standard_flag(out)
-        else:
-            out = cls.add_standard_flag(out)
+        out = cls.handle_standard_flag(out, skip_standard_flag)
         return out
 
 
@@ -123,10 +110,7 @@ def get_flags(cls, skip_standard_flag=False, **kwargs):
         """
         out = super(ClangPPCompiler, cls).get_flags(**kwargs)
         # Add/remove standard library flag
-        if skip_standard_flag:
-            out = cls.remove_standard_flag(out)
-        else:
-            out = cls.add_standard_flag(out)
+        out = cls.handle_standard_flag(out, skip_standard_flag)
         return out
 
     @classmethod