Allow double-adding exact same config option

manticore/utils/config.py

@@ -103,6 +103,10 @@ def add(self, name: str, default=None, description: str = None):
 
         """
         if name in self._vars:
+            # Be kind when double-adding the same exact config
+            existing = self._vars[name]
+            if default == existing.default and description == existing.description:
+                return
             raise ConfigError(f"{self.name}.{name} already defined.")
 
         if name == "name":

manticore/wasm/cli.py

@@ -4,6 +4,7 @@
 from ..utils import config
 
 consts = config.get_group("cli")
+consts.add("profile", default=False, description="Enable worker profiling mode")
 consts.add("target_func", default="main", description="WASM Function to execute")
 
 

tests/other/utils/test_config.py

@@ -41,12 +41,17 @@ def test_default_vars(self):
         self.assertFalse(g._vars["val1"].was_set)
         self.assertTrue(g._vars["val2"].was_set)
 
-    def test_double_add(self):
+    def test_double_add_different(self):
         g = config.get_group("test1")
         g.add("val1", default="foo")
         with self.assertRaises(config.ConfigError):
             g.add("val1")
 
+    def test_double_add_exact_duplicate(self):
+        g = config.get_group("test2")
+        g.add("val1", default="foo", description="Some description")
+        g.add("val1", default="foo", description="Some description")
+
     def test_update(self):
         g = config.get_group("update")
         g.add("val", default="default", description="description")

tests/wasm/test_examples.py

@@ -121,7 +121,6 @@ def test_implicit_call(self):
         self.assertEqual(sorted(results), [70])
 
     def test_wasm_main(self):
-        config.get_group("cli").add("profile", False)
         m = wasm_main(
             namedtuple("Args", ["argv", "workspace", "policy"])([collatz_file], "mcore_tmp", "ALL"),
             None,