From 0978181e4081de66a097cfa33f93618cef4104ca Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 25 Jun 2010 16:08:20 +0000
Subject: [PATCH] LMS-1546 HCS distribution: minor improvement
SVN: 16756
---
integration-tests/build/build.xml | 14 ++++++++++++++
.../integration-tests-service.properties | 2 +-
integration-tests/test-screening.sh | 1 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/integration-tests/build/build.xml b/integration-tests/build/build.xml
index 458f607108e..54edb53700e 100644
--- a/integration-tests/build/build.xml
+++ b/integration-tests/build/build.xml
@@ -90,6 +90,20 @@
</antcall>
</target>
+ <target name="screening-integration-tests"
+ description="Runs integration tests for screening openBIS, fetches distribution from Cruise Control.">
+ <exec executable="sh" dir="${basedir}" resultproperty="result-code">
+ <arg value="./test-screening.sh" />
+ </exec>
+ <fail>
+ <condition>
+ <not>
+ <equals arg1="${result-code}" arg2="0" />
+ </not>
+ </condition>
+ </fail>
+ </target>
+
<!--
// Cleans 'install' and 'playground' directories.
-->
diff --git a/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties b/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties
index 5e50b60ebbf..cf6c8bcc51b 100644
--- a/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties
+++ b/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties
@@ -5,4 +5,4 @@
# ---------------------------------------------------------------------------
imaging.database.kind = integration_tests
-database.kind = integration_tests
\ No newline at end of file
+database.kind = screening_integration_tests
\ No newline at end of file
diff --git a/integration-tests/test-screening.sh b/integration-tests/test-screening.sh
index a6ec61e5f90..825571f18dc 100755
--- a/integration-tests/test-screening.sh
+++ b/integration-tests/test-screening.sh
@@ -93,6 +93,7 @@ function install_screening_api {
function install_screening {
fetch_distributions
+ rm -fr $WORK
mkdir -p $WORK
install_dss_screening
install_and_run_openbis_server_screening "true"
--
GitLab