Fix coverage

Author: e10harvey

src/setprogramoptions/unittests/files_ini/config_test_setprogramoptions.ini

@@ -156,6 +156,12 @@ opt-set-cmake-var CMAKE_F90_FLAGS STRING: "${CMAKE_F90_FLAGS|CMAKE} -baz"
 use TEST_VAR_EXPANSION_UPDATE_01
 opt-set-cmake-var CMAKE_CXX_FLAGS STRING FORCE : "${CMAKE_CXX_FLAGS|CMAKE} -bif"
 
+[TEST_VAR_EXPANSION_UPDATE_04]
+opt-set cmake
+use TEST_VAR_EXPANSION_COMMON
+# Test (return None) at SetProgramOptionsCMake.py:_program_option_handler_opt_set_cmake_var_bash:188
+opt-set-cmake-var CMAKE_CXX_FLAGS STRING : "${LDFLAGS|ENV} -foobar"
+
 [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

@@ -219,6 +219,27 @@ def test_SetProgramOptionsCMake_gen_option_list_bash_expandvars(self):
         option_list_actual = parser.gen_option_list(section, generator="bash")
         pprint(option_list_actual, width=200)
 
+        self.assertListEqual(option_list_expect, option_list_actual)
+        print("-----[ TEST END ]------------------------------------------")
+        print("OK")
+
+        print("-----[ TEST BEGIN ]----------------------------------------")
+        section = "TEST_VAR_EXPANSION_UPDATE_04"
+        print("Section  : {}".format(section))
+
+        self._execute_parser(parser, section)
+
+        print("-" * 40)
+        print("Option List")
+        print("-" * 40)
+        option_list_expect = [
+            'cmake',
+            '-DCMAKE_CXX_FLAGS:STRING="${LDFLAGS} -foo"',
+        ]
+
+        option_list_actual = parser.gen_option_list(section, generator="bash")
+        pprint(option_list_actual, width=200)
+
         self.assertListEqual(option_list_expect, option_list_actual)
         print("-----[ TEST END ]------------------------------------------")
         print("OK")
@@ -315,8 +336,40 @@ def test_SetProgramOptionsCMake_gen_option_list_cmake_fragment_expandvars(self):
         self.assertListEqual(option_list_expect, option_list_actual)
 
         print("-----[ TEST END ]------------------------------------------")
+        print("OK")
 
+        # The following TEST_VAR_EXPANSION_UPDATE_04 does not increase coverage
+        # but is here to illustrate the correctness issue reported in
+        # TRILFRAME-120. To compare the option_list_expect below to that
+        # of the option_list_expect for the bash generator, see the
+        # TEST_VAR_EXPANSION_UPDATE_04 test above in
+        # test_SetProgramOptionsCMake_gen_option_list_bash_expandvars.
+        print("-----[ TEST BEGIN ]----------------------------------------")
+        section = "TEST_VAR_EXPANSION_UPDATE_04"
+        print("Section  : {}".format(section))
+
+        # parse a section
+        self._execute_parser(parser, section)
+
+        parser.gen_option_list(section, generator="cmake_fragment")
+
+        option_list_expect = [
+            # Only the first set with "-foo" sticks in the cmake cache.
+            # If the second set with "-foobar" used FORCE, it would stick.
+            'set(CMAKE_CXX_FLAGS "$ENV{LDFLAGS} -foo" CACHE STRING "from .ini configuration")',
+            'set(CMAKE_CXX_FLAGS "$ENV{LDFLAGS} -foobar" CACHE STRING "from .ini configuration")',
+        ]
+
+        option_list_actual = parser.gen_option_list(section, generator="cmake_fragment")
+
+        print("Expected Output:\n{}\n".format("\n".join(option_list_expect)))
+        print("Actual Output:\n{}\n".format("\n".join(option_list_actual)))
+
+        self.assertListEqual(option_list_expect, option_list_actual)
+
+        print("-----[ TEST END ]------------------------------------------")
         print("OK")
+
         return 0
 
     def test_SetProgramOptionsCMake_param_order_01(self):