From e10a8186e0dd69512380d5e6c0d6fa1c0346f159 Mon Sep 17 00:00:00 2001 From: BinaryFZ Date: Tue, 14 Jul 2020 14:48:56 +0800 Subject: [PATCH 1/2] enable case:RT0142 --- .../ReflectionAnnotationGetClass.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/testsuite/ouroboros/reflection_test/RT0142-rt-reflection-ReflectionAnnotationGetClass/ReflectionAnnotationGetClass.java b/test/testsuite/ouroboros/reflection_test/RT0142-rt-reflection-ReflectionAnnotationGetClass/ReflectionAnnotationGetClass.java index d3bf18567e..0cd9fec4f0 100644 --- a/test/testsuite/ouroboros/reflection_test/RT0142-rt-reflection-ReflectionAnnotationGetClass/ReflectionAnnotationGetClass.java +++ b/test/testsuite/ouroboros/reflection_test/RT0142-rt-reflection-ReflectionAnnotationGetClass/ReflectionAnnotationGetClass.java @@ -72,3 +72,4 @@ class Two { } // EXEC:%maple %f %build_option -o %n.so // EXEC:%run %n.so %n %run_option | compare %f +// ASSERT: scan 0\n -- Gitee From 280abc620ec041777a0cc6e9801bcb98f5d64297 Mon Sep 17 00:00:00 2001 From: binaryfz Date: Wed, 22 Jul 2020 10:50:33 +0800 Subject: [PATCH 2/2] support jbc2mpl -dumpPragma --- test/testsuite/maple.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/testsuite/maple.py b/test/testsuite/maple.py index f893660809..43af43216a 100644 --- a/test/testsuite/maple.py +++ b/test/testsuite/maple.py @@ -258,6 +258,7 @@ def do_prepare(components, info, maple_root): components["javac"].update_info(None, info["javac"]) components["jar"].update_info(None, info["jar"]) + components["jbc2mpl"].update_info(maple_out_bin_path, info["jbc2mpl"]) components["maple"].update_info(maple_out_bin_path, info["maple"]) components["as"].update_info(gnu_bin_path, info["as"]) components["cc"].update_info(gnu_bin_path, info["cc"]) @@ -280,12 +281,20 @@ def do_prepare(components, info, maple_root): def do_update(components, file_type): if file_type == "javac": components.pop("jar") + components.pop("jbc2mpl") components.pop("maple") components.pop("as") components.pop("cc") components.pop("cxx") components.pop("ld") elif file_type == "jar": + components.pop("jbc2mpl") + components.pop("maple") + components.pop("as") + components.pop("cc") + components.pop("cxx") + components.pop("ld") + elif file_type == "jbc2mpl": components.pop("maple") components.pop("as") components.pop("cc") @@ -333,7 +342,8 @@ def main(): components = collections.OrderedDict() components["javac"] = Javac("/usr/bin/javac", ".java", ".class", "") components["jar"] = Jar("/usr/bin/jar", ".class", ".jar", "") - components["maple"] = SingleCompiler("maple", ".jar", ".VtableImpl.s", "") + components["jbc2mpl"] = SingleCompiler("jbc2mpl", ".jar", ".mpl", "") + components["maple"] = SingleCompiler("maple", ".mpl", ".VtableImpl.s", "") components["as"] = MultiCompiler("clang++", ".s", ".o", "") components["cc"] = MultiCompiler("clang", ".c", ".o", "") components["cxx"] = MultiCompiler("clang++", ".cpp", ".o", "") -- Gitee