Skip to content

Commit c0cda59

Browse files
committed
backport 44d62c8e21fb09381f9f86a081f70549cc321b1e
1 parent d20a6ca commit c0cda59

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

test/hotspot/jtreg/containers/docker/TestJcmdWithSideCar.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import java.io.IOException;
4444
import java.io.InputStreamReader;
4545
import java.nio.file.Paths;
46-
import java.util.Arrays;
4746
import java.util.ArrayList;
47+
import java.util.Arrays;
4848
import java.util.Collections;
4949
import java.util.EnumSet;
5050
import java.util.List;
@@ -53,7 +53,9 @@
5353
import java.util.function.Consumer;
5454
import java.util.regex.Pattern;
5555
import java.util.stream.Collectors;
56+
5657
import jdk.test.lib.Container;
58+
import jdk.test.lib.Platform;
5759
import jdk.test.lib.Utils;
5860
import jdk.test.lib.containers.docker.Common;
5961
import jdk.test.lib.containers.docker.DockerRunOptions;
@@ -109,6 +111,11 @@ public static void main(String[] args) throws Exception {
109111
mainContainer.waitForMainMethodStart(TIME_TO_WAIT_FOR_MAIN_METHOD_START);
110112

111113
for (AttachStrategy attachStrategy : EnumSet.allOf(AttachStrategy.class)) {
114+
if (attachStrategy == AttachStrategy.ACCESS_TMP_VIA_PROC_ROOT &&
115+
elevated && !Platform.isRoot()) {
116+
// Elevated attach via proc/root not yet supported.
117+
continue;
118+
}
112119
long mainProcPid = testCase01(attachStrategy, elevated);
113120

114121
// Excluding the test case below until JDK-8228850 is fixed

0 commit comments

Comments
 (0)