Skip to content

Commit 4fb3c21

Browse files
committed
fix: apply PR review
1 parent cef26ac commit 4fb3c21

3 files changed

Lines changed: 441 additions & 184 deletions

File tree

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,27 +169,27 @@ By default, the script clones the repository at the current commit for clean bui
169169
# Force rebuild of base image only (useful after Alpine/Ubuntu updates)
170170
./utils/run-containers-tests.sh --libc=musl --rebuild-base
171171

172-
# Preview the full supported local test matrix without running containers
173-
./utils/run-containers-tests.sh --matrix
172+
# Preview all supported musl cells (sanitizer configs are skipped, matching CI policy)
173+
./utils/run-containers-tests.sh --libc=musl --jdk=all --arch=all
174174

175-
# Run all supported musl cells (sanitizer configs are skipped, matching CI policy)
176-
./utils/run-containers-tests.sh --matrix --libc=musl --run
175+
# Run all supported musl cells without an interactive prompt
176+
./utils/run-containers-tests.sh --libc=musl --jdk=all --arch=all --run
177177

178-
# Run all aarch64 debug cells
179-
./utils/run-containers-tests.sh --matrix --arch=aarch64 --config=debug --run
178+
# Preview selected JDKs across every supported libc/architecture pair
179+
./utils/run-containers-tests.sh --libc=all --jdk=8,17,21 --arch=all
180180

181181
# Run all OpenJ9 cells
182-
./utils/run-containers-tests.sh --matrix --jdk=j9 --run
182+
./utils/run-containers-tests.sh --jdk=j9 --arch=all --run
183183

184184
# Show options
185185
./utils/run-containers-tests.sh --help
186186
```
187187

188188
Supported options:
189-
- `--libc=glibc|musl|all` (default: glibc; `all` only with `--matrix`)
190-
- `--jdk=8|11|17|21|25|8-j9|11-j9|17-j9|21-j9|17-graal|21-graal|25-graal|j9|graal|regular|all` (default: 21; groups/`all` only with `--matrix`)
191-
- `--arch=x64|aarch64|all` (default: auto-detect; `all` only with `--matrix`)
192-
- `--config=debug|release|asan|tsan|all` (default: debug; `all` only with `--matrix`)
189+
- `--libc=glibc|musl|all[,..]` (default: glibc)
190+
- `--jdk=8|11|17|21|25|8-j9|11-j9|17-j9|21-j9|17-graal|21-graal|25-graal|regular|j9|graal|all[,..]` (default: 21)
191+
- `--arch=x64|aarch64|all[,..]` (default: auto-detect)
192+
- `--config=debug|release|asan|tsan|all[,..]` (default: debug)
193193
- `--container=podman|docker` (default: podman)
194194
- `--tests="TestPattern"`
195195
- `--gtest` (enable C++ gtests, disabled by default for faster runs)
@@ -198,11 +198,11 @@ Supported options:
198198
- `--mount` (mount local repo instead of cloning - faster but may have stale artifacts)
199199
- `--rebuild` (force rebuild of all container images)
200200
- `--rebuild-base` (force rebuild of base image only)
201-
- `--matrix` (preview a test matrix; unset dimensions expand to `all`)
202-
- `--run` (execute matrix mode; invalid without `--matrix`)
201+
- `--matrix` (preview a full test matrix; unset dimensions expand to `all`)
202+
- `--run` (execute an inferred matrix without prompting)
203203
- `--fail-fast` (stop matrix execution on first failure)
204204

205-
Without `--matrix`, the script keeps its single-cell behavior and runs one configuration immediately. With `--matrix`, the script previews the expanded matrix by default and only runs containers when `--run` is present. Matrix execution writes summaries to `build/reports/container-matrix/summary.md` and `build/reports/container-matrix/summary.json`.
205+
Single-value commands run one configuration immediately. When any dimension expands to multiple cells, the script prints a compact status table first; interactive terminals ask for confirmation, while non-interactive runs require `--run` to execute. Matrix execution prints the status table again after all cells finish and writes summaries to `build/reports/container-matrix/summary.md` and `build/reports/container-matrix/summary.json`.
206206

207207
## Unwinding Validation Tool
208208

utils/README.md

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,20 @@ Runs tests in containers across various OS/libc/JDK combinations, mirroring the
8484
**Usage:**
8585
```bash
8686
./utils/run-containers-tests.sh [options]
87-
--libc=glibc|musl|all (default: glibc; all only with --matrix)
88-
--jdk=8|11|17|21|25|8-j9|...|j9|graal|regular|all
89-
(default: 21; groups/all only with --matrix)
90-
--arch=x64|aarch64|all (default: auto-detect; all only with --matrix)
91-
--config=debug|release|asan|tsan|all (default: debug; all only with --matrix)
87+
--libc=glibc|musl|all[,..] (default: glibc)
88+
--jdk=8|11|17|21|25|8-j9|...|regular|j9|graal|all[,..]
89+
(default: 21)
90+
--arch=x64|aarch64|all[,..] (default: auto-detect)
91+
--config=debug|release|asan|tsan|all[,..] (default: debug)
9292
--container=podman|docker (default: podman)
9393
--tests="TestPattern" (optional)
9494
--gtest (enable C++ gtests)
9595
--gtest-task=Task (run one C++ gtest task)
9696
--shell (drop to shell instead of running tests)
9797
--mount (mount local repo instead of cloning)
9898
--rebuild (force rebuild of container images)
99-
--matrix (preview a test matrix)
100-
--run (execute matrix mode)
99+
--matrix (preview a full matrix)
100+
--run (execute an inferred matrix without prompting)
101101
--fail-fast (stop matrix execution on first failure)
102102
```
103103

@@ -109,20 +109,17 @@ Examples:
109109
# Use Docker instead of the default Podman runtime
110110
./utils/run-containers-tests.sh --container=docker --libc=glibc --jdk=21
111111

112-
# Preview the full supported local matrix without running containers
113-
./utils/run-containers-tests.sh --matrix
112+
# Preview selected JDKs across every supported libc/architecture pair
113+
./utils/run-containers-tests.sh --libc=all --jdk=8,17,21 --arch=all
114114

115-
# Run all supported musl cells (sanitizer configs are skipped, matching CI policy)
116-
./utils/run-containers-tests.sh --matrix --libc=musl --run
117-
118-
# Run all aarch64 debug cells
119-
./utils/run-containers-tests.sh --matrix --arch=aarch64 --config=debug --run
115+
# Run all supported musl cells without an interactive prompt
116+
./utils/run-containers-tests.sh --libc=musl --jdk=all --arch=all --run
120117

121118
# Run all OpenJ9 cells
122-
./utils/run-containers-tests.sh --matrix --jdk=j9 --run
119+
./utils/run-containers-tests.sh --jdk=j9 --arch=all --run
123120
```
124121

125-
Without `--matrix`, the script keeps its single-cell behavior and runs one container test configuration immediately. With `--matrix`, unset dimensions expand to `all`; the command previews the expanded matrix by default and only executes when `--run` is also provided. Matrix execution writes summaries to `build/reports/container-matrix/summary.md` and `build/reports/container-matrix/summary.json`.
122+
Single-value commands run one container test configuration immediately. When any dimension expands to multiple cells, the script prints a compact status table first; interactive terminals ask for confirmation, while non-interactive runs require `--run` to execute. Matrix execution prints the status table again after all cells finish and writes summaries to `build/reports/container-matrix/summary.md` and `build/reports/container-matrix/summary.json`.
126123

127124
### `patch-dd-java-agent.sh`
128125

0 commit comments

Comments
 (0)