Make testCallTarget more robust

hpi-swa · Oct 26, 2021 · fbb9a61 · fbb9a61
1 parent a0a6b53
commit fbb9a61
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/TruffleSqueak-Tests.package/TruffleSqueakTest.class/instance/testCallTarget.st b/src/TruffleSqueak-Tests.package/TruffleSqueakTest.class/instance/testCallTarget.st
@@ -1,14 +1,18 @@
 testing
 testCallTarget
-	| method string |
-	Java primitiveIsHostLookupAllowed ifFalse: [ ^ false ].
+	| method callTarget string |
+	Java primitiveIsHostLookupAllowed ifFalse: [ ^ self ].
 
 	self assert: (SmalltalkImage >> #exitToDebugger) callTarget isNil.
 
 	method := Integer >> #benchFib.
 	1 benchFib. "Ensure method is called"
+	callTarget := method callTarget.
 
-	self deny: method callTarget isNil.
+	self deny: callTarget isNil.
+
+	(callTarget getClass getName asString includesSubstring: 'OptimizedCallTarget')
+		ifFalse: [ ^ self ].
 
-	string := CallTargetBrowser callTargetInfoStringFor: method callTarget.
+	string := CallTargetBrowser callTargetInfoStringFor: callTarget.
 	self assert: (string includesSubstring: 'knownCallSiteCount')
diff --git a/src/TruffleSqueak-Tests.package/TruffleSqueakTest.class/methodProperties.json b/src/TruffleSqueak-Tests.package/TruffleSqueakTest.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"assertSorted:name:" : "fn 1/25/2020 15:24",
 		"testAdoptInstanceArrays" : "fn 1/31/2020 10:20",
 		"testArrayStatistics" : "fn 5/13/2020 17:37",
-		"testCallTarget" : "fn 3/12/2021 11:08",
+		"testCallTarget" : "fn 10/26/2021 21:10",
 		"testLayoutStatistics" : "fn 5/13/2020 17:37",
 		"testTestMapConsistency" : "fn 3/9/2021 15:59",
 		"testVMIntrospection" : "fn 3/30/2021 17:01" } }