This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch ee11 in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 27302f7d6c25d9be44060bf07e9fbf9485a76872 Author: Markus Jung <[email protected]> AuthorDate: Sat Jul 18 20:34:27 2026 +0200 Reduce the webprofile manifest to per-partition overrides --- runner-webprofile/README.md | 3 ++- runner-webprofile/platform-suite-webprofile.tsv | 19 +++---------------- runner-webprofile/platform-suite.tsv | 2 +- runner-webprofile/run-platform-suite.sh | 13 +++++++++++-- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/runner-webprofile/README.md b/runner-webprofile/README.md index 85a8b65..bf04bb7 100644 --- a/runner-webprofile/README.md +++ b/runner-webprofile/README.md @@ -15,7 +15,8 @@ example `runner-webprofile/run-platform-suite.sh servlet rest`. The EclipseLink-based TomEE Plume distribution is the default target under test; 448 of the 450 Jakarta Persistence javatest classes pass there. Set `TOMEE_CLASSIFIER=webprofile` to test the OpenJPA-based `webprofile` ZIP -instead. The script then reads `platform-suite-webprofile.tsv` and prefers +instead. The script then merges the per-partition overrides from +`platform-suite-webprofile.tsv` over the base manifest and prefers partition exclusions from `exclusions/webprofile/` where they exist — the OpenJPA provider blocks 249 of the 450 persistence classes there (see `KNOWN_FAILURES.md`): diff --git a/runner-webprofile/platform-suite-webprofile.tsv b/runner-webprofile/platform-suite-webprofile.tsv index 71ad7e8..d7bbbcd 100644 --- a/runner-webprofile/platform-suite-webprofile.tsv +++ b/runner-webprofile/platform-suite-webprofile.tsv @@ -1,18 +1,5 @@ -# Jakarta EE Platform TCK 11.0.3 artifact inventory for the OpenJPA-based -# TomEE webprofile distribution (TOMEE_CLASSIFIER=webprofile). Only the -# persistence expectations differ from the default Plume manifest. +# Per-partition overrides applied on top of platform-suite.tsv when +# TOMEE_CLASSIFIER=webprofile (the OpenJPA-based ZIP). Rows replace the base +# row with the same id; only the persistence expectations differ. # id artifact protocol junit_tag_expression source_classes expected_executed_classes failsafe_include -jdbc jdbc-platform-tck javatest web & tck-javatest 152 152 **/*JSP.java,**/*Servlet.java -enterprise-beans-30 ejb30 javatest web & tck-javatest 282 170 **/*Test.java -enterprise-beans-32 ejb32 javatest web & tck-javatest 72 48 **/*Test.java -expression-language el-platform-tck javatest web & tck-javatest 72 66 **/*Test.java -json-binding jsonb-platform-tck javatest web & tck-javatest 6 4 **/*Test.java -json-processing jsonp-platform-tck javatest web & tck-javatest 4 4 **/*Test.java -pages pages-platform-tck servlet web & !tck-javatest 2 2 **/*IT.java -persistence-servlet persistence-platform-tck-tests servlet web & !tck-javatest 1 0 **/*Test.java persistence-javatest persistence-platform-tck-tests javatest web & tck-javatest 450 201 **/*Test.java -rest rest-platform-tck servlet web & !tck-javatest 18 15 **/*IT.java -tags tags-tck servlet web & !tck-javatest 50 0 **/*IT.java -transactions transactions-tck javatest web & tck-javatest 16 6 **/*Test.java -websocket-platform websocket-tck-platform-tests servlet web & !tck-javatest 5 5 **/*IT.java -signature signaturevalidation javatest web 2 0 **/ClientSignatureJspTest.java,**/ClientSignatureServletTest.java diff --git a/runner-webprofile/platform-suite.tsv b/runner-webprofile/platform-suite.tsv index cd77f2c..be8fa24 100644 --- a/runner-webprofile/platform-suite.tsv +++ b/runner-webprofile/platform-suite.tsv @@ -1,6 +1,6 @@ # Jakarta EE Platform TCK 11.0.3 artifact inventory for the default TomEE # Plume distribution (EclipseLink). platform-suite-webprofile.tsv carries the -# expectations for the OpenJPA-based webprofile ZIP. +# per-partition overrides for the OpenJPA-based webprofile ZIP. # id artifact protocol junit_tag_expression source_classes expected_executed_classes failsafe_include jdbc jdbc-platform-tck javatest web & tck-javatest 152 152 **/*JSP.java,**/*Servlet.java enterprise-beans-30 ejb30 javatest web & tck-javatest 282 170 **/*Test.java diff --git a/runner-webprofile/run-platform-suite.sh b/runner-webprofile/run-platform-suite.sh index 3d022a9..b888f07 100755 --- a/runner-webprofile/run-platform-suite.sh +++ b/runner-webprofile/run-platform-suite.sh @@ -18,8 +18,17 @@ ONLY_PARTITION=${2:-} # platform-suite-webprofile.tsv counts and exclusions/webprofile overrides. TOMEE_CLASSIFIER=${TOMEE_CLASSIFIER:-plume} MANIFEST="$SCRIPT_DIR/platform-suite.tsv" -if [ -f "$SCRIPT_DIR/platform-suite-$TOMEE_CLASSIFIER.tsv" ]; then - MANIFEST="$SCRIPT_DIR/platform-suite-$TOMEE_CLASSIFIER.tsv" +# A classifier-specific manifest carries only the rows that differ; merge it +# over the base manifest by partition id. +OVERRIDES="$SCRIPT_DIR/platform-suite-$TOMEE_CLASSIFIER.tsv" +if [ -f "$OVERRIDES" ]; then + MERGED=$(mktemp "${TMPDIR:-/tmp}/platform-suite.XXXXXX") + trap 'rm -f "$MERGED"' EXIT HUP INT TERM + awk -F'\t' ' + NR == FNR { if ($0 !~ /^(#|$)/) override[$1] = $0; next } + { print ($1 in override ? override[$1] : $0) } + ' "$OVERRIDES" "$MANIFEST" > "$MERGED" + MANIFEST="$MERGED" fi if [ "$PROTOCOL" != "servlet" ] && [ "$PROTOCOL" != "javatest" ]; then
