Merge branch '10-setprogramoptions-bash-string-output-should-be-surrounded-by-double-quotes' into 'master'

Resolve "SetProgramOptions bash STRING output should be surrounded by double quotes"

Closes #10

See merge request trilinos-devops-consolidation/code/SetProgramOptions!11

Author: e10harvey

src/setprogramoptions/SetProgramOptions.py

@@ -553,6 +553,9 @@ def _generic_program_option_handler_bash(self, params: list, value: str) -> str:
         """
         output = "".join(params)
         if value is not None:
+            # Make sure STRING flag values are surrounded by double quotes
+            if "STRING" in output and not value.startswith('"') and not value.endswith('"'):
+                value = f'"{value}"'
             output += "=" + value
         return output
 

src/setprogramoptions/unittests/files_ini/config_test_setprogramoptions.ini

@@ -155,3 +155,7 @@ opt-set-cmake-var CMAKE_F90_FLAGS STRING: "${CMAKE_F90_FLAGS|CMAKE} -baz"
 [TEST_VAR_EXPANSION_UPDATE_03]
 use TEST_VAR_EXPANSION_UPDATE_01
 opt-set-cmake-var CMAKE_CXX_FLAGS STRING: "${CMAKE_CXX_FLAGS|CMAKE} -bif"
+
+[TEST_STRING_DOUBLE_QUOTES]
+opt-set-cmake-var Panzer_FADTYPE STRING: Sacado::Fad::DFad<RealType>
+opt-set-cmake-var DART_TESTING_TIMEOUT STRING: "600"

src/setprogramoptions/unittests/test_SetProgramOptionsCMake.py

@@ -394,6 +394,40 @@ def test_SetProgramOptionsCMake_param_order_02(self):
         print("OK")
         return
 
+    def test_SetProgramOptionsCMake_test_STRING_value_surrounded_by_double_quotes(self):
+        """
+        Test STRING values are surrounded by double quotes.
+        """
+        print("\n")
+        print("Load file: {}".format(self._filename))
+        parser = self._create_standard_parser()
+
+        print("-----[ TEST BEGIN ]----------------------------------------")
+        section = "TEST_STRING_DOUBLE_QUOTES"
+        print("Section  : {}".format(section))
+
+        option_list_expect = [
+            '-DPanzer_FADTYPE:STRING="Sacado::Fad::DFad<RealType>"',
+            '-DDART_TESTING_TIMEOUT:STRING="600"',
+        ]
+        option_list_actual = parser.gen_option_list(section, generator="bash")
+
+        print("-" * 40)
+        print("Options List Expect")
+        print("-" * 40)
+        pprint(option_list_expect, width=120)
+        print("")
+        print("Options List Actual")
+        print("-" * 40)
+        pprint(option_list_actual, width=120)
+
+        self.assertEqual(option_list_expect, option_list_actual)
+
+        print("-----[ TEST END ]------------------------------------------")
+
+        print("OK")
+        return 0
+
     def _create_standard_parser(
         self, filename=DEFAULT_VALUE(), debug_level=5, ece_level=4, ece_compact=False
     ):