Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-06-15 11:19:08 +0000
committerCamille Letavernier2015-06-15 14:23:03 +0000
commit9c83c52f03e411a83f3210d90e146afd44557200 (patch)
treedf7d0929c7c49f322d6a825c925ebbb0cb377f63
parent1610956774bfb863a3c92f160f31238675bb83a0 (diff)
downloadorg.eclipse.papyrus-9c83c52f03e411a83f3210d90e146afd44557200.tar.gz
org.eclipse.papyrus-9c83c52f03e411a83f3210d90e146afd44557200.tar.xz
org.eclipse.papyrus-9c83c52f03e411a83f3210d90e146afd44557200.zip
[Gerrit Test] Clean verify + new variable to skip tests
Change-Id: I2a83f8ee0a21a7ecb390d9e983d2086506f24a85 Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
-rw-r--r--releng/extra-tests/pom.xml1
-rw-r--r--releng/gerrit.test1
-rw-r--r--releng/main-tests/pom.xml1
-rw-r--r--releng/pom.xml2
-rw-r--r--tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml2
6 files changed, 5 insertions, 4 deletions
diff --git a/releng/extra-tests/pom.xml b/releng/extra-tests/pom.xml
index 3558a1e6cd9..2fc623ccc3c 100644
--- a/releng/extra-tests/pom.xml
+++ b/releng/extra-tests/pom.xml
@@ -14,7 +14,6 @@
<properties>
<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
<testSuiteClass>org.eclipse.papyrus.tests.extra.AllTests</testSuiteClass>
- <skipInnerTests>true</skipInnerTests>
</properties>
<modules>
<!-- Extra-tests modules -->
diff --git a/releng/gerrit.test b/releng/gerrit.test
new file mode 100644
index 00000000000..864026d4fde
--- /dev/null
+++ b/releng/gerrit.test
@@ -0,0 +1 @@
+Gerrit build test 3 - Clean compile \ No newline at end of file
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 82004599b90..d59c3535565 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -111,7 +111,6 @@
<properties>
<testConfig>CI_TESTS_CONFIG</testConfig> <!-- See org.eclipse.papyrus.junit.framework.classification.ClassificationConfig -->
<testSuiteClass>org.eclipse.papyrus.tests.AllTests</testSuiteClass>
- <skipInnerTests>true</skipInnerTests>
</properties>
<repositories>
<repository>
diff --git a/releng/pom.xml b/releng/pom.xml
index b36d64d5092..4564fcf6e5e 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -16,6 +16,8 @@
<java.target.version>1.7</java.target.version>
<papyrus.eclipse.target>mars</papyrus.eclipse.target>
<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
+ <skipAllTests>false</skipAllTests>
+ <skipInnerTests>true</skipInnerTests>
</properties>
<modules>
diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml
index 372bbbc83e7..e1c8dc1372e 100644
--- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml
+++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/pom.xml
@@ -27,7 +27,7 @@
<argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M</argLine>
<appArgLine>-testConfig=${testConfig}</appArgLine>
<product>org.eclipse.sdk.ide</product>
- <skipTests>false</skipTests>
+ <skipTests>${skipAllTests}</skipTests>
</configuration>
</plugin>
<plugin>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
index 88b88ae5f81..3fced15563c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/pom.xml
@@ -26,7 +26,7 @@
<argLine>-Xms512m -Xmx2048m -XX:MaxPermSize=512M -XX:SoftRefLRUPolicyMSPerMB=100</argLine>
<appArgLine>-testConfig=${testConfig}</appArgLine>
<product>org.eclipse.sdk.ide</product>
- <skipTests>false</skipTests>
+ <skipTests>${skipAllTests}</skipTests>
<testClass>org.eclipse.papyrus.tests.AllTests</testClass>
</configuration>
</plugin>

Back to the top