From 11c1b862df08e841a57c6fde5db63d7dd314302f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 17 Sep 2020 12:55:25 +0200 Subject: build: Allow test program item UIDs with a "-" Update #3818. --- wscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index d4f2efbfb7..59782c3e1b 100755 --- a/wscript +++ b/wscript @@ -636,7 +636,7 @@ class LibraryItem(Item): class TestProgramItem(Item): def __init__(self, uid, data): super(TestProgramItem, self).__init__(uid, data) - name = uid.split("/")[-1].upper() + name = uid.split("/")[-1].upper().replace("-", "_") self.exclude = "TEST_" + name + "_EXCLUDE" self.cppflags = "TEST_" + name + "_CPPFLAGS" @@ -958,7 +958,9 @@ class OptionItem(Item): self._do_append_test_cppflags(conf, name, "-DTEST_STATE_BENCHMARK=1") def _test_state_exclude(self, conf, name): - conf.env.append_value("ENABLE", "TEST_" + name.upper() + "_EXCLUDE") + conf.env.append_value( + "ENABLE", "TEST_" + name.upper().replace("-", "_") + "_EXCLUDE" + ) def _test_state_expected_fail(self, conf, name): self._do_append_test_cppflags( -- cgit v1.2.3