You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2017/06/07 19:05:06 UTC
Change in asterixdb[master]: += skip.surefire.tests
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1810
Change subject: += skip.surefire.tests
......................................................................
+= skip.surefire.tests
Add option to enable skipping only surefire tests, allowing integration
tests to run
Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
---
M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
3 files changed, 8 insertions(+), 26 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/10/1810/1
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
index ec8333a..be84bc3 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
@@ -41,13 +41,10 @@
import org.apache.hyracks.api.io.IODeviceHandle;
import org.apache.hyracks.control.common.utils.ThreadDumpHelper;
import org.apache.hyracks.control.nc.NodeControllerService;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Utils for running SQL++ or AQL runtime tests.
*/
-@RunWith(Parameterized.class)
public class LangExecutionUtil {
private static final String PATH_ACTUAL = "target" + File.separator + "rttest" + File.separator;
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index cc06150..b708187 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -43,21 +43,20 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <file.encoding>UTF-8</file.encoding>
<jvm.extraargs />
<jdk.version>1.8</jdk.version>
<runSlowAQLTests>false</runSlowAQLTests>
<appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
<sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath>
<debug.suspend.flag>n</debug.suspend.flag>
+ <skip.surefire.tests>${skipTests}</skip.surefire.tests>
<!-- Definition of tests in various categories which may be excluded -->
- <optimizer.tests>**/optimizer/**/*Test.java</optimizer.tests>
- <metadata.tests>**/metadata/*Test.java</metadata.tests>
- <execution.tests>**/ExecutionTest.java</execution.tests>
<repeated.tests>**/RepeatedTest.java</repeated.tests>
<invalid.tests>**/DmlTest.java</invalid.tests>
- <global.test.includes>**/*TestSuite.java,**/*Test.java,${execution.tests}</global.test.includes>
- <global.test.excludes>${optimizer.tests},${metadata.tests},${invalid.tests},${repeated.tests}</global.test.excludes>
+ <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
+ <global.test.excludes>${invalid.tests},${repeated.tests}</global.test.excludes>
<failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
<cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
@@ -107,6 +106,7 @@
<excludes>
<exclude>${global.test.excludes},${test.excludes}</exclude>
</excludes>
+ <skipTests>${skip.surefire.tests}</skipTests>
</configuration>
</plugin>
<plugin>
@@ -440,24 +440,6 @@
<id>slow-aql-tests</id>
<properties>
<runSlowAQLTests>true</runSlowAQLTests>
- </properties>
- </profile>
- <profile>
- <id>optimizer-tests</id>
- <properties>
- <optimizer.tests />
- </properties>
- </profile>
- <profile>
- <id>metadata-tests</id>
- <properties>
- <metadata.tests />
- </properties>
- </profile>
- <profile>
- <id>execution-tests</id>
- <properties>
- <execution.tests />
</properties>
</profile>
<profile>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index b6d482e..08aae02 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -51,10 +51,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <file.encoding>UTF-8</file.encoding>
<jdk.version>1.8</jdk.version>
<jvm.extraargs />
<sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath>
<source-format.skip>false</source-format.skip>
+ <skip.surefire.tests>${skipTests}</skip.surefire.tests>
<!-- Definition of tests in various categories which may be excluded -->
<hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests>
@@ -256,6 +258,7 @@
<excludes combine.children="append">
<exclude>${global.test.excludes},${test.excludes}</exclude>
</excludes>
+ <skipTests>${skip.surefire.tests}</skipTests>
</configuration>
</plugin>
<plugin>
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack
PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3092/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1349/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/4093/ (3/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/707/ (7/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app-test/5/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
TRIGGER asterix-gerrit-verify-asterix-app-test
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/894/ (9/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/285/ (1/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/3092/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/10/ (2/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/5571/ (6/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1: BAD+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1349/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/722/ (4/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/625/ (5/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: += skip.surefire.tests
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/11/ (8/9)
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: += skip.surefire.tests
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has submitted this change and it was merged.
Change subject: += skip.surefire.tests
......................................................................
+= skip.surefire.tests
Add option to enable skipping only surefire tests, allowing integration
tests to run
Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1810
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
BAD: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Reviewed-by: Ian Maxon <im...@apache.org>
---
M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
3 files changed, 8 insertions(+), 26 deletions(-)
Approvals:
Yingyi Bu: Looks good to me, approved
Ian Maxon: Looks good to me, approved
Jenkins: Verified; No violations found; No violations found; Verified
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
index ec8333a..be84bc3 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
@@ -41,13 +41,10 @@
import org.apache.hyracks.api.io.IODeviceHandle;
import org.apache.hyracks.control.common.utils.ThreadDumpHelper;
import org.apache.hyracks.control.nc.NodeControllerService;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
/**
* Utils for running SQL++ or AQL runtime tests.
*/
-@RunWith(Parameterized.class)
public class LangExecutionUtil {
private static final String PATH_ACTUAL = "target" + File.separator + "rttest" + File.separator;
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index cc06150..b708187 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -43,21 +43,20 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <file.encoding>UTF-8</file.encoding>
<jvm.extraargs />
<jdk.version>1.8</jdk.version>
<runSlowAQLTests>false</runSlowAQLTests>
<appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory>
<sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath>
<debug.suspend.flag>n</debug.suspend.flag>
+ <skip.surefire.tests>${skipTests}</skip.surefire.tests>
<!-- Definition of tests in various categories which may be excluded -->
- <optimizer.tests>**/optimizer/**/*Test.java</optimizer.tests>
- <metadata.tests>**/metadata/*Test.java</metadata.tests>
- <execution.tests>**/ExecutionTest.java</execution.tests>
<repeated.tests>**/RepeatedTest.java</repeated.tests>
<invalid.tests>**/DmlTest.java</invalid.tests>
- <global.test.includes>**/*TestSuite.java,**/*Test.java,${execution.tests}</global.test.includes>
- <global.test.excludes>${optimizer.tests},${metadata.tests},${invalid.tests},${repeated.tests}</global.test.excludes>
+ <global.test.includes>**/*TestSuite.java,**/*Test.java</global.test.includes>
+ <global.test.excludes>${invalid.tests},${repeated.tests}</global.test.excludes>
<failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes>
<cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes>
@@ -107,6 +106,7 @@
<excludes>
<exclude>${global.test.excludes},${test.excludes}</exclude>
</excludes>
+ <skipTests>${skip.surefire.tests}</skipTests>
</configuration>
</plugin>
<plugin>
@@ -440,24 +440,6 @@
<id>slow-aql-tests</id>
<properties>
<runSlowAQLTests>true</runSlowAQLTests>
- </properties>
- </profile>
- <profile>
- <id>optimizer-tests</id>
- <properties>
- <optimizer.tests />
- </properties>
- </profile>
- <profile>
- <id>metadata-tests</id>
- <properties>
- <metadata.tests />
- </properties>
- </profile>
- <profile>
- <id>execution-tests</id>
- <properties>
- <execution.tests />
</properties>
</profile>
<profile>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index b6d482e..08aae02 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -51,10 +51,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <file.encoding>UTF-8</file.encoding>
<jdk.version>1.8</jdk.version>
<jvm.extraargs />
<sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath>
<source-format.skip>false</source-format.skip>
+ <skip.surefire.tests>${skipTests}</skip.surefire.tests>
<!-- Definition of tests in various categories which may be excluded -->
<hanging.pregelix.tests>**/pregelix/**/FailureRecovery*.java</hanging.pregelix.tests>
@@ -256,6 +258,7 @@
<excludes combine.children="append">
<exclude>${global.test.excludes},${test.excludes}</exclude>
</excludes>
+ <skipTests>${skip.surefire.tests}</skipTests>
</configuration>
</plugin>
<plugin>
--
To view, visit https://asterix-gerrit.ics.uci.edu/1810
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I846bcc66cef115c572c75188f952bacc4b9858aa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>