Skip to content

Commit 4df8abc

Browse files
author
Harold Seigel
committed
8255787: Tag container tests that use cGroups with cgroups keyword
Reviewed-by: sspitsyn
1 parent ec08b3f commit 4df8abc

15 files changed

+20
-5
lines changed

test/hotspot/jtreg/TEST.ROOT

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
# headful: test can be run only on headful host
3232
# intermittent: flaky test, known to fail intermittently
3333
# randomness: test uses randomness, test cases differ from run to run
34-
keys=stress headful intermittent randomness
34+
# cgroups: test uses cgroups
35+
keys=stress headful intermittent randomness cgroups
3536

3637
groups=TEST.groups TEST.quick-groups
3738

test/hotspot/jtreg/containers/cgroup/CgroupSubsystemFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test CgroupSubsystemFactory
26+
* @key cgroups
2627
* @requires os.family == "linux"
2728
* @library /testlibrary /test/lib
2829
* @build sun.hotspot.WhiteBox

test/hotspot/jtreg/containers/cgroup/PlainRead.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test PlainRead
26+
* @key cgroups
2627
* @requires os.family == "linux"
2728
* @library /testlibrary /test/lib
2829
* @build sun.hotspot.WhiteBox

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @key cgroups
2728
* @summary Test JVM's CPU resource awareness when running inside docker container
2829
* @requires docker.support
2930
* @library /test/lib

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @key cgroups
2728
* @summary Test JVM's awareness of cpu sets (cpus and mems)
2829
* @requires docker.support
2930
* @requires (os.arch != "s390x")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @key cgroups
2728
* @summary Ensure that certain JFR events return correct results for resource values
2829
* when run inside Docker container, such as available CPU and memory.
2930
* Also make sure that PIDs are based on value provided by container,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
/*
2626
* @test
27+
* @key cgroups
2728
* @summary Test JVM's memory resource awareness when running inside docker container
2829
* @requires docker.support
2930
* @library /test/lib

test/jdk/TEST.ROOT

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
# run. Tests that are not headful are "headless".
1414
# A test flagged with key "printer" requires a printer to succeed, else
1515
# throws a PrinterException or the like.
16+
# A test flagged with cgroups uses cgroups.
1617

17-
keys=2d dnd headful i18n intermittent printer randomness jfr
18+
keys=2d dnd headful i18n intermittent printer randomness jfr cgroups
1819

1920
# Tests that must run in othervm mode
2021
othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/swing javax/print \

test/jdk/jdk/internal/platform/cgroup/TestCgroupMetrics.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
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
@@ -23,6 +23,7 @@
2323

2424
/*
2525
* @test
26+
* @key cgroups
2627
* @requires os.family == "linux"
2728
* @modules java.base/jdk.internal.platform
2829
* @library /test/lib

test/jdk/jdk/internal/platform/cgroup/TestCgroupSubsystemController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
/*
4545
* @test
46+
* @key cgroups
4647
* @requires os.family == "linux"
4748
* @modules java.base/jdk.internal.platform
4849
* @library /test/lib

0 commit comments

Comments
 (0)