Skip to content

Commit d551dac

Browse files
MBaeskenjerboaa
andcommittedFeb 25, 2025
8350103: Test containers/systemd/SystemdMemoryAwarenessTest.java fails on Linux ppc64le SLES15 SP6
Co-authored-by: Severin Gehwolf <sgehwolf@openjdk.org> Reviewed-by: sgehwolf, asteiner
1 parent ab86a13 commit d551dac

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
 

‎test/hotspot/jtreg/containers/systemd/SystemdMemoryAwarenessTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024, Red Hat, Inc.
2+
* Copyright (c) 2024, 2025, Red Hat, Inc.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -68,14 +68,14 @@ private static void testHelloSystemd() throws Exception {
6868

6969
OutputAnalyzer out = SystemdTestUtils.buildAndRunSystemdJava(opts);
7070
out.shouldHaveExitValue(0)
71-
.shouldContain("Hello Systemd")
72-
.shouldContain(String.format("Memory Limit is: %d", (expectedMemLimit * MB)));
71+
.shouldContain("Hello Systemd");
7372
try {
73+
out.shouldContain(String.format("Memory Limit is: %d", (expectedMemLimit * MB)));
7474
out.shouldContain("OSContainer::active_processor_count: " + coreLimit);
7575
} catch (RuntimeException e) {
76-
// CPU delegation needs to be enabled when run as user on cg v2
76+
// CPU/memory delegation needs to be enabled when run as user on cg v2
7777
if (SystemdTestUtils.RUN_AS_USER) {
78-
String hint = "When run as user on cg v2 cpu delegation needs to be configured!";
78+
String hint = "When run as user on cg v2 cpu/memory delegation needs to be configured!";
7979
throw new SkippedException(hint);
8080
}
8181
throw e;

0 commit comments

Comments
 (0)
Please sign in to comment.