auto-sync: fix test!

imbillow · Jul 20, 2024 · 3b6abc2 · 3b6abc2
1 parent 389590d
commit 3b6abc2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/suite/auto-sync/src/autosync/cpptranslator/Tests/test_patches.py b/suite/auto-sync/src/autosync/cpptranslator/Tests/test_patches.py
@@ -106,15 +106,16 @@ def check_patching_result(self, patch, syntax, expected, filename=""):
 
         self.assertGreater(len(captures_bundle), 0)
         for cb in captures_bundle:
-            self.assertEqual(patch.get_patch(cb, syntax, **kwargs), expected)
+            actual = patch.get_patch(cb, syntax, **kwargs)
+            self.assertEqual(actual, expected)
 
     def test_addcsdetail(self):
         patch = AddCSDetail(0, "ARCH")
         syntax = b"int i = x; void printThumbLdrLabelOperand(MCInst *MI, unsigned OpNo, SStream *O) { int i = OpNo; }"
         self.check_patching_result(
             patch,
             syntax,
-            b"void printThumbLdrLabelOperand(MCInst *MI, unsigned OpNo, SStream *O){ "
+            b"static inline void printThumbLdrLabelOperand(MCInst *MI, unsigned OpNo, SStream *O){ "
             b"add_cs_detail(MI, ARCH_OP_GROUP_ThumbLdrLabelOperand, OpNo); "
             b"int i = OpNo; "
             b"}",
@@ -131,8 +132,8 @@ def test_addoperand(self):
 
     def test_assert(self):
         patch = Assert(0)
-        syntax = b"assert(0 == 0)"
-        self.check_patching_result(patch, syntax, b"")
+        syntax = b"assert(0 == 0);"
+        self.check_patching_result(patch, syntax, b"CS_ASSERT(0 == 0);")
 
     def test_bitcaststdarray(self):
         patch = BitCastStdArray(0)

diff --git a/suite/auto-sync/src/autosync/cpptranslator/patches/AddCSDetail.py b/suite/auto-sync/src/autosync/cpptranslator/patches/AddCSDetail.py
@@ -95,7 +95,9 @@ def get_add_cs_detail(
     ) -> bytes:
         op_group_enum = (
             self.arch.encode("utf8") + b"_OP_GROUP_" + fcn_id[5:]
-        ).upper()  # Remove "print" from function id
+        )  # Remove "print" from function id
+        if self.arch == "XTENSA":
+            op_group_enum = op_group_enum.upper()
 
         is_template = fcn_def.prev_sibling.type == "template_parameter_list"
         op_num_var_name = (