From ee5516a890f9eab78db5b82afebe84482c73e72f Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Mon, 6 May 2013 07:09:35 +0000
Subject: [PATCH] SWE-22 / SP-641: run both test suites of project 'openbis'
SVN: 29000
---
gradle/javaproject.gradle | 13 +++++++------
openbis/build.gradle | 6 ++++++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index d52ab1fc0f5..8ed952349cd 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -34,12 +34,13 @@ repositories {
}
test {
- useTestNG()
- options { suites(file('sourceTest/java/tests.xml')) }
-
- jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m'
-
- testLogging.showStandardStreams = true
+ useTestNG {
+ suites = ['sourceTest/java/tests.xml']
+ }
+
+ jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m'
+
+ testLogging.showStandardStreams = true
}
task sourceJar(type: Jar) {
diff --git a/openbis/build.gradle b/openbis/build.gradle
index a38e6e9d97d..92e25de2288 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -116,3 +116,9 @@ task copyTestData(type: Copy, dependsOn: testClasses) {
test.dependsOn(copyTestData)
+test {
+ useTestNG {
+ suites.add('sourceTest/java/tests_system_cleandb_excluding_authorization.xml')
+ }
+}
+
--
GitLab