From ca74c29bc4f140f3987f08957c45a019d5944768 Mon Sep 17 00:00:00 2001 From: Olof Kraigher Date: Thu, 30 Jul 2015 18:52:58 +0200 Subject: [PATCH] Fixes issue #65 --- vunit/test/unit/test_test_configuration.py | 4 ++++ vunit/test_configuration.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/vunit/test/unit/test_test_configuration.py b/vunit/test/unit/test_test_configuration.py index b3a595e79..66bad2759 100644 --- a/vunit/test/unit/test_test_configuration.py +++ b/vunit/test/unit/test_test_configuration.py @@ -171,6 +171,10 @@ def test_sim_options(self): def test_fail_on_unknown_sim_option(self): self.assertRaises(ValueError, self.cfg.set_sim_option, "unknown", "value") + def test_issue_65(self): + self.cfg.set_generic(name="name", value=1, scope=create_scope()) + self.cfg.set_sim_option(name="vsim_extra_args", value="-quiet", scope=create_scope()) + @staticmethod def write_file(name, contents): with open(name, "w") as fwrite: diff --git a/vunit/test_configuration.py b/vunit/test_configuration.py index 62083dbad..eb2363455 100644 --- a/vunit/test_configuration.py +++ b/vunit/test_configuration.py @@ -68,7 +68,7 @@ def set_sim_option(self, name, value, scope=create_scope()): name, self._known_options) raise ValueError(name) - if scope not in self._generics: + if scope not in self._sim_options: self._sim_options[scope] = {} self._sim_options[scope][name] = value