From b2ea2bc33309596f864fad131e4799993b53ec46 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 19 Nov 2020 12:58:54 -0600 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 5ad93de453..f5b7629b3b 100755 --- a/wscript +++ b/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) -- cgit v1.2.3