From 230e5f31ebeb790cc3de05961a098e920c62734b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 10 Sep 2012 07:04:27 +0000
Subject: [PATCH] BIS-142 run two test suites: tests.xml and
tests_system_cleandb_without_authorization.xml
SVN: 26559
---
openbis/build/build.xml | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index 2cb750acdae..89c490bf8d2 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -305,7 +305,30 @@
<!--
// Task for continuous integration server.
-->
- <target name="ci" depends="check-dictionary-syntax, build-common.ci, check-dependencies, dist" description="Task for continuous integration server." />
+ <target name="ci" depends="check-dictionary-syntax, run-two-test-suites, check-restrictions, check-dependencies, dist" description="Task for continuous integration server." />
+
+ <target name="run-two-test-suites">
+ <delete dir="${output.test}" />
+
+ <antcall target="_run-testng">
+ <param name="test.suite" value="tests.xml" />
+ <param name="failure.property" value="tests.failed" />
+ </antcall>
+ <antcall target="_run-testng">
+ <param name="test.suite" value="tests_system_cleandb_without_authorization.xml" />
+ <param name="failure.property" value="tests.failed" />
+ </antcall>
+
+ <junitreport todir="${output.test}">
+ <fileset dir="${output.test}">
+ <include name="*/*.xml" />
+ </fileset>
+ <report format="noframes" todir="${output.test}" />
+ </junitreport>
+ <fail if="tests.failed" message="At least one test failed." />
+ </target>
+
+
<!--
// Nightly build task for continuous integration server. // CR : Remove run-system-tests from the dependencies
--
GitLab