From d84afdf67a71357789b0bda1efd1f34bd4321268 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 14 Mar 2008 17:10:54 +0000
Subject: [PATCH] set default values to config.py and check them before running the tests
---
opends/tests/system-tests/phases/main_run_lib.xml | 12 ++++++++++++
opends/tests/system-tests/config.py | 6 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/opends/tests/system-tests/config.py b/opends/tests/system-tests/config.py
index 02a40ec..34abdfa 100755
--- a/opends/tests/system-tests/config.py
+++ b/opends/tests/system-tests/config.py
@@ -34,10 +34,10 @@
STAF_LOCAL_HOSTNAME = 'localhost'
STAF_REMOTE_HOSTNAME = 'localhost'
-TMPDIR = '/local/qa/realtmp'
-OPENDSDIR = '/local/qa/workspace/ws4/opends'
+TMPDIR = 'NEED_VALUE'
+OPENDSDIR = 'NEED_VALUE'
TESTS_ROOT = '%s/tests' % OPENDSDIR
TESTS_DIR = '%s/system-tests' % TESTS_ROOT
DIRECTORY_INSTANCE_DN = 'cn=directory manager'
DIRECTORY_INSTANCE_PSWD = 'secret12'
-JAVA_HOME = '/usr/lib/jvm/java-6-sun/jre'
+JAVA_HOME = 'NEED_VALUE'
diff --git a/opends/tests/system-tests/phases/main_run_lib.xml b/opends/tests/system-tests/phases/main_run_lib.xml
index 3b4d6a7..f55a076 100644
--- a/opends/tests/system-tests/phases/main_run_lib.xml
+++ b/opends/tests/system-tests/phases/main_run_lib.xml
@@ -36,6 +36,18 @@
<message>'ERROR config.py : OPENDSDIR variable not defined'</message>
<script> ERR_NUM[0] += 1 </script>
</sequence>
+ <elseif expr="TMPDIR == 'NEED_VALUE'">
+ <sequence>
+ <message>'ERROR config.py : TMPDIR variable not defined'</message>
+ <script> ERR_NUM[0] += 1 </script>
+ </sequence>
+ </elseif>
+ <elseif expr="JAVA_HOME == 'NEED_VALUE'">
+ <sequence>
+ <message>'ERROR config.py : JAVA_HOME variable not defined'</message>
+ <script> ERR_NUM[0] += 1 </script>
+ </sequence>
+ </elseif>
<else>
<sequence>
<call function="'grep'">
--
Gitblit v1.10.0