You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/07/05 14:44:11 UTC
[tomee-tck] branch master updated: Commit out missing SQL files,
turn on database setup, and detect Java 10 and 11
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/master by this push:
new a9161ae Commit out missing SQL files, turn on database setup, and detect Java 10 and 11
a9161ae is described below
commit a9161ae82f866ae21444382747b244574340e00b
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Fri Jul 5 14:41:52 2019 +0000
Commit out missing SQL files, turn on database setup, and detect Java 10 and 11
---
pom.xml | 4 ++--
runtests | 4 ++--
src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index f93d4c5..ec9564b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,9 +623,9 @@
<srcFile>src/test/sql/derby/derby.ddl.cmp.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.interop.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.jacc.sql</srcFile>
- <srcFile>src/test/sql/derby/derby.ddl.jbatch-tck.sql</srcFile>
+ <!--<srcFile>src/test/sql/derby/derby.ddl.jbatch-tck.sql</srcFile>-->
<srcFile>src/test/sql/derby/derby.ddl.jstl.sql</srcFile>
- <srcFile>src/test/sql/derby/derby.ddl.persistence.sprocs.sql</srcFile>
+ <!--<srcFile>src/test/sql/derby/derby.ddl.persistence.sprocs.sql</srcFile>-->
<srcFile>src/test/sql/derby/derby.ddl.persistence.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.sprocs.sql</srcFile>
<srcFile>src/test/sql/derby/derby.dml.sql</srcFile>
diff --git a/runtests b/runtests
index 8c4ee1a..0cdd1b4 100755
--- a/runtests
+++ b/runtests
@@ -244,7 +244,7 @@ processOptions "$@"
# Validate web
case "$web" in
tomee-plus|tomee-plume|tomee|tomcat|none)
- profile="full"
+ profile="web-profile"
true
;;
tomcat-web)
@@ -260,7 +260,7 @@ esac
rm -fr derbydb
unzip -q derbydb.zip
-sql=skip
+#sql=skip
# Append options if any
if [ "x$options" != "x" ]; then
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 0417178..098d353 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -213,7 +213,7 @@ class JavaTestCommand
}
def opts = get('tck.java.opts')
- if (tckJavaVersion != null && (tckJavaVersion.startsWith("9") || tckJavaVersion.startsWith("1.9"))) {
+ if (tckJavaVersion != null && (tckJavaVersion.startsWith("9") || tckJavaVersion.startsWith("1.9") || tckJavaVersion.startsWith("10") || tckJavaVersion.startsWith("11") )) {
jvmarg(value: "-Dtck.java.opts=" +
"-Dopenejb.deployer.jndiname=openejb/WebappDeployerRemote " +
"--add-opens java.base/java.net=ALL-UNNAMED " +