generalize most test inputs

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
compspec · May 24, 2022 · 49ed473 · 49ed473
1 parent 3b6cf54
commit 49ed473
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 16 deletions.
diff --git a/examples/dwarf/examples.yaml b/examples/dwarf/examples.yaml
@@ -1,6 +1 @@
-examples:
- - name: array
- - name: callsite
- - name: classorder
- - name: libmath
- - name: struct
+examples: []
diff --git a/examples/dwarf/lib/function-params/compspec.json b/examples/dwarf/lib/function-params/compspec.json
@@ -5,35 +5,59 @@
             "B",
             "id3",
             "function",
-            "compileunit:example.cpp->namespace:Example->function:ReturnRemove"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example12ReturnRemoveEdd"
         ],
         [
             "A",
             "B",
             "id6",
             "function",
-            "compileunit:example.cpp->namespace:Example->function:ReturnChange"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example12ReturnChangeEdd"
         ],
         [
             "A",
             "B",
             "id9",
             "function",
-            "compileunit:example.cpp->namespace:Example->function:Change"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6ChangeEdd"
         ],
         [
             "A",
             "B",
             "id12",
             "function",
-            "compileunit:example.cpp->namespace:Example->function:Remove"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6RemoveEdd"
         ],
         [
             "A",
             "B",
             "id15",
             "function",
-            "compileunit:example.cpp->namespace:Example->function:Add"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example3AddEdd"
+        ],
+        [
+            "A",
+            "B",
+            "id9",
+            "function",
+            "_ZN7Example6ChangeEdd",
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6ChangeEdd"
+        ],
+        [
+            "A",
+            "B",
+            "id12",
+            "function",
+            "_ZN7Example6RemoveEdd",
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6RemoveEdd"
+        ],
+        [
+            "A",
+            "B",
+            "id15",
+            "function",
+            "_ZN7Example3AddEdd",
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example3AddEdd"
         ]
     ],
     "added_node": [
@@ -421,45 +445,70 @@
             "_G_fpos_t",
             "compileunit:example.cpp->const:_G_fpos_t"
         ],
+        [
+            "A",
+            "B",
+            "id1753",
+            "function",
+            "_ZN7Example6ChangeEdi",
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6ChangeEdi"
+        ],
+        [
+            "A",
+            "B",
+            "id1756",
+            "function",
+            "_ZN7Example6RemoveEd",
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6RemoveEd"
+        ],
+        [
+            "A",
+            "B",
+            "id1758",
+            "function",
+            "_ZN7Example3AddEddd",
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example3AddEddd"
+        ],
         [
             "A",
             "B",
             "id1785",
             "parameter",
             "c",
-            "compileunit:example.cpp->namespace:Example->function:Change->parameter:c"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6ChangeEdi->parameter:c"
         ],
         [
             "A",
             "B",
             "id1787",
             "type",
             "int",
-            "compileunit:example.cpp->namespace:Example->function:Change->parameter:c->type:int"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6ChangeEdi->parameter:c->type:int"
         ],
         [
             "A",
             "B",
             "id1788",
             "location",
             "framebase-28",
-            "compileunit:example.cpp->namespace:Example->function:Change->parameter:c->location:framebase-28"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example6ChangeEdi->parameter:c->location:framebase-28"
         ],
         [
             "A",
             "B",
             "id1803",
             "parameter",
             "c",
-            "compileunit:example.cpp->namespace:Example->function:Add->parameter:c"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example3AddEddd->parameter:c"
         ],
         [
             "A",
             "B",
             "id1806",
             "location",
             "framebase-40",
-            "compileunit:example.cpp->namespace:Example->function:Add->parameter:c->location:framebase-40"
+            "compileunit:example.cpp->namespace:Example->function:_ZN7Example3AddEddd->parameter:c->location:framebase-40"
         ]
     ]
 }
+
diff --git a/examples/dwarf/tests.py b/examples/dwarf/tests.py
@@ -18,12 +18,21 @@
 sys.path.insert(0, here)
 from run import main as run
 
+# Custom names or libs
 examples = utils.read_yaml("examples.yaml")
 tests = []
+seen = set()
 for e in examples["examples"]:
     if "name" not in e:
         continue
     tests.append((e["name"], e.get("lib1", "lib.v1.so"), e.get("lib2", "lib.v2.so")))
+    seen.add(e["name"])
+
+# Add remainder
+for name in os.listdir(os.path.join(here, "lib")):
+    if name not in seen:
+        tests.append((name, "lib.v1.so", "lib.v2.so"))
+    seen.add(name)
 
 
 @pytest.mark.parametrize("name,lib1,lib2", tests)