8269087: CheckSegmentedCodeCache test fails in an emulated-client VM

mychris · Igor Veresov · commit 595446bff4af · 2021-06-24T16:49:45.000Z
Reviewed-by: iveresov, kvn
diff --git a/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java b/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
@@ -58,7 +58,7 @@ private static void verifySegmentedCodeCache(ProcessBuilder pb, boolean enabled)
                 out.shouldContain(NON_METHOD);
             } catch (RuntimeException e) {
                 // Check if TieredCompilation is disabled (in a client VM)
-                if (!out.getOutput().contains("-XX:+TieredCompilation not supported in this VM")) {
+                if (Platform.isTieredSupported()) {
                     // Code cache is not segmented
                     throw new RuntimeException("No code cache segmentation.");
                 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private static void verifySegmentedCodeCache(ProcessBuilder pb, boolean enabled)`
`58`	`58`	`out.shouldContain(NON_METHOD);`
`59`	`59`	`} catch (RuntimeException e) {`
`60`	`60`	`// Check if TieredCompilation is disabled (in a client VM)`
`61`		`- if (!out.getOutput().contains("-XX:+TieredCompilation not supported in this VM")) {`
	`61`	`+ if (Platform.isTieredSupported()) {`
`62`	`62`	`// Code cache is not segmented`
`63`	`63`	`throw new RuntimeException("No code cache segmentation.");`
`64`	`64`	`}`