wscript: Apply test state expectations correctly

The variety of expected test states are not currently applied to tests
with names containing '-' correctly due to a failure to replace '-' with
'_' before adding the CPPFLAGS to the environment for that test. This
ensures that all additions of CPPFLAGS have that replacement performed
so that the CPPFLAGS are applied properly during compilation.

wscript

@@ -723,7 +723,7 @@ class OptionItem(Item):
         print("{} = {}".format(self.data["name"], value))
 
     def _do_append_test_cppflags(self, conf, name, state):
-        conf.env.append_value("TEST_" + name.upper() + "_CPPFLAGS", state)
+        conf.env.append_value("TEST_" + name.upper().replace("-", "_") + "_CPPFLAGS", state)
 
     def _append_test_cppflags(self, conf, cic, value, arg):
         self._do_append_test_cppflags(conf, arg, value)