From 5b76374b3a195b57d912d653adf114ed385236de Mon Sep 17 00:00:00 2001 From: Markus Schneider Date: Wed, 23 Apr 2014 18:49:31 +0200 Subject: [PATCH 1/3] Added basic travis.yml. Skipping integration tests for now. --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..edd7977e18 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: java +jdk: + - openjdk7 + - oraclejdk7 +install: "travis_retry mvn install -DskipTests=true -B -V" +script: "travis_retry mvn verify -B -V" +env: MAVEN_OPTS="-XX:MaxPermSize=128m" From 749dfdfba8379af5154074785ddab79cdd824e59 Mon Sep 17 00:00:00 2001 From: Markus Schneider Date: Wed, 23 Apr 2014 19:21:04 +0200 Subject: [PATCH 2/3] Do not ignore integration test failures. Deactivated deegree-wms-remoteows-tests for now (because it contains failures). --- deegree-tests/deegree-compliance-tests/pom.xml | 1 - deegree-tests/deegree-csw-bkg/pom.xml | 1 - deegree-tests/deegree-wms-remoteows-tests/pom.xml | 1 - deegree-tests/deegree-wms-similarity-tests/pom.xml | 1 - deegree-tests/deegree-wms-tiling-tests/pom.xml | 1 - deegree-tests/deegree-wmts-tests/pom.xml | 1 - deegree-tests/deegree-workspace-tests/pom.xml | 1 - deegree-tests/pom.xml | 2 ++ 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/deegree-tests/deegree-compliance-tests/pom.xml b/deegree-tests/deegree-compliance-tests/pom.xml index c369203b07..5334e82c33 100644 --- a/deegree-tests/deegree-compliance-tests/pom.xml +++ b/deegree-tests/deegree-compliance-tests/pom.xml @@ -66,7 +66,6 @@ maven-surefire-plugin true - true **/${testPattern}.java diff --git a/deegree-tests/deegree-csw-bkg/pom.xml b/deegree-tests/deegree-csw-bkg/pom.xml index c9b1c76d7a..9dc5769a5d 100644 --- a/deegree-tests/deegree-csw-bkg/pom.xml +++ b/deegree-tests/deegree-csw-bkg/pom.xml @@ -80,7 +80,6 @@ maven-surefire-plugin true - true **/*IT.java diff --git a/deegree-tests/deegree-wms-remoteows-tests/pom.xml b/deegree-tests/deegree-wms-remoteows-tests/pom.xml index a11da161bb..206cba2dba 100644 --- a/deegree-tests/deegree-wms-remoteows-tests/pom.xml +++ b/deegree-tests/deegree-wms-remoteows-tests/pom.xml @@ -69,7 +69,6 @@ maven-surefire-plugin true - true **/*IntegrationTest.java diff --git a/deegree-tests/deegree-wms-similarity-tests/pom.xml b/deegree-tests/deegree-wms-similarity-tests/pom.xml index 01da46d47e..eec2f294e1 100644 --- a/deegree-tests/deegree-wms-similarity-tests/pom.xml +++ b/deegree-tests/deegree-wms-similarity-tests/pom.xml @@ -69,7 +69,6 @@ maven-surefire-plugin true - true **/*IntegrationTest.java diff --git a/deegree-tests/deegree-wms-tiling-tests/pom.xml b/deegree-tests/deegree-wms-tiling-tests/pom.xml index a68e765c77..dd26de3577 100644 --- a/deegree-tests/deegree-wms-tiling-tests/pom.xml +++ b/deegree-tests/deegree-wms-tiling-tests/pom.xml @@ -76,7 +76,6 @@ maven-surefire-plugin true - true **/*IntegrationTest.java **/*PerformanceTest.java diff --git a/deegree-tests/deegree-wmts-tests/pom.xml b/deegree-tests/deegree-wmts-tests/pom.xml index c6504902d6..a312ef380d 100644 --- a/deegree-tests/deegree-wmts-tests/pom.xml +++ b/deegree-tests/deegree-wmts-tests/pom.xml @@ -76,7 +76,6 @@ maven-surefire-plugin true - true -Xmx1324m -Xss128m -XX:-UseGCOverheadLimit -Xincgc -Dportnumber=${portnumber} -Drequestdir=${project.basedir}/src/test/requests/ diff --git a/deegree-tests/deegree-workspace-tests/pom.xml b/deegree-tests/deegree-workspace-tests/pom.xml index 003718eef8..b645067652 100644 --- a/deegree-tests/deegree-workspace-tests/pom.xml +++ b/deegree-tests/deegree-workspace-tests/pom.xml @@ -85,7 +85,6 @@ maven-surefire-plugin true - true **/*IT.java diff --git a/deegree-tests/pom.xml b/deegree-tests/pom.xml index 665b3aeb35..af5677c183 100644 --- a/deegree-tests/pom.xml +++ b/deegree-tests/pom.xml @@ -86,7 +86,9 @@ deegree-compliance-tests deegree-wms-similarity-tests deegree-wms-tiling-tests + deegree-wmts-tests deegree-resource-deps-tests From 3838c400ec73541aca339d513e5929d1b5f0edeb Mon Sep 17 00:00:00 2001 From: Markus Schneider Date: Wed, 23 Apr 2014 19:27:50 +0200 Subject: [PATCH 3/3] Activate integration-tests --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index edd7977e18..eaf57c72fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: java jdk: - openjdk7 - oraclejdk7 -install: "travis_retry mvn install -DskipTests=true -B -V" -script: "travis_retry mvn verify -B -V" +install: "travis_retry mvn install -Pintegration-tests -DskipTests=true -B -V" +script: "travis_retry mvn verify -Pintegration-tests -B -V" env: MAVEN_OPTS="-XX:MaxPermSize=128m"