Update debuginfotest to work with new debug info

oracle · Mar 16, 2021 · 8340c27 · 8340c27
1 parent b3cbb07
commit 8340c27
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/substratevm/mx.substratevm/testhello.py b/substratevm/mx.substratevm/testhello.py
@@ -189,8 +189,10 @@ def test():
     exec_string = execute("backtrace")
     checker = Checker("backtrace hello.Hello::main",
                       [r"#0%shello\.Hello::main\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:67"%(spaces_pattern, wildcard_pattern),
-                       r"#1%s%s in com\.oracle\.svm\.core\.code\.IsolateEnterStub::JavaMainWrapper_run_%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, address_pattern, wildcard_pattern, package_pattern)
-                       ])
+                       r"#1%s%s in com\.oracle\.svm\.core\.JavaMainWrapper::runCore%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, address_pattern, wildcard_pattern, package_pattern),
+                       r"#2%s com\.oracle\.svm\.core\.JavaMainWrapper::run%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern),
+                       r"#3%smain%s at %sIsolateEnterStub\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern)
+                      ])
     checker.check(exec_string, skip_fails=False)
 
     if can_print_data:
@@ -267,16 +269,9 @@ def test():
     # expect "All functions matching regular expression "java.io.PrintStream.println":"
     # expect ""
     # expect "File java.base/java/io/PrintStream.java:"
-    # expect "      void java.io.PrintStream::println(java.lang.Object);"
-    # expect "      void java.io.PrintStream::println(java.lang.String);"
+    # expect "      void java.io.PrintStream::println(java.lang.Object *);"
+    # expect "      void java.io.PrintStream::println(java.lang.String *);"
     exec_string = execute("info func java.io.PrintStream::println")
-    #    checker = Checker("info func java.io.PrintStream::println",
-    #                      ["All functions matching regular expression \"java\\.io\\.PrintStream::println\":",
-    #                       "",
-    #                       "File .*java/io/PrintStream.java:",
-    #                       "[ \t]*void java.io.PrintStream::println\\(java\\.lang\\.Object \\*\\);",
-    #                       "[ \t]*void java.io.PrintStream::println\\(java\\.lang\\.String \\*\\);",
-    #                      ])
     rexp = r"%svoid java.io.PrintStream::println\(java\.lang\.String \*\)"%maybe_spaces_pattern
     checker = Checker("info func java.io.PrintStream::println", rexp)
     checker.check(exec_string)
@@ -380,8 +375,10 @@ def test():
     checker = Checker("backtrace hello.Hello.Greeter::greeter",
                       [r"#0%shello\.Hello\$Greeter::greeter\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:34"%(spaces_pattern, wildcard_pattern),
                        r"#1%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:67"%(spaces_pattern, address_pattern, wildcard_pattern),
-                       r"#2%s%s in com\.oracle\.svm\.core\.code\.IsolateEnterStub::JavaMainWrapper_run_%s at [a-z/]+/JavaMainWrapper\.java:%s"%(spaces_pattern, address_pattern, wildcard_pattern, digits_pattern)
-                       ])
+                       r"#2%s%s in com\.oracle\.svm\.core\.JavaMainWrapper::runCore%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, address_pattern, wildcard_pattern, package_pattern),
+                       r"#3%s com\.oracle\.svm\.core\.JavaMainWrapper::run%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern),
+                       r"#4%smain%s at %sIsolateEnterStub\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern)
+                      ])
     checker.check(exec_string, skip_fails=False)
 
     # now step into inlined code