Update debuginfotest to work with new debug info

oracle · Sep 30, 2020 · 2deb19c · 2deb19c
1 parent 5c92d36
commit 2deb19c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/substratevm/mx.substratevm/testhello.py b/substratevm/mx.substratevm/testhello.py
@@ -154,7 +154,9 @@ 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%s com\.oracle\.svm\.core\.code\.IsolateEnterStub::JavaMainWrapper_run_%s at %sIsolateEnterStub\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern)
                       ])
     checker.check(exec_string, skip_fails=False)
 
@@ -173,7 +175,7 @@ def test():
 #                       "[ \t]*void java.io.PrintStream::println\\(java\\.lang\\.String\\)\\(void\\);",
 #                      ])
     checker = Checker("info func java.io.PrintStream::println",
-                      r"%svoid java.io.PrintStream::println\(java\.lang\.String\)"%maybe_spaces_pattern)
+                      r"[0-9]*:?%svoid java.io.PrintStream::println\(java\.lang\.String\)"%maybe_spaces_pattern)
     checker.check(exec_string)
 
     # set a break point at PrintStream::println(String)
@@ -201,7 +203,9 @@ 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%s com\.oracle\.svm\.core\.code\.IsolateEnterStub::JavaMainWrapper_run_%s at %sIsolateEnterStub\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern)
                       ])
     checker.check(exec_string, skip_fails=False)