From bc4edce28c7c4303776e9fb7c1dc194b198d12d0 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Fri, 02 Mar 2007 01:41:23 +0000
Subject: [PATCH] fixed issues in the installer for solaris sparc. (LD_LIBRARY_PATH. fixed eol-style issue on installer files. added javadoc target to generate functional tests documentation. added email capability in the run-daily target. config.py.stubs is back to referencing python variables.
---
opends/tests/functional-tests/staf-installer/config.py.stubs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opends/tests/functional-tests/staf-installer/config.py.stubs b/opends/tests/functional-tests/staf-installer/config.py.stubs
index 1c03f20..430b5a1 100644
--- a/opends/tests/functional-tests/staf-installer/config.py.stubs
+++ b/opends/tests/functional-tests/staf-installer/config.py.stubs
@@ -1,31 +1,31 @@
TEST_OS_STRING = '${os.name}'
-TEST_HW_STRING = '${os.arch}(${sun.arch.data.model} bits)'
-TEST_JVM_STRING = '${java.version}'
+TEST_HW_STRING = '${os.arch}'
+TEST_JVM_STRING = '${java.version}(${sun.arch.data.model} bits)'
STAF_LOCAL_HOSTNAME = 'localhost'
STAF_REMOTE_HOSTNAME = 'localhost'
STAF_JAVA_HOME = '${java.home}'
STAF_HOME_DIR = '${staf.install.dir}'
TMPDIR = '${staf.tmp.dir}'
-PSWDFILE = '${staf.tmp.dir}/password'
+PSWDFILE = '%s/password' % TMPDIR
OPENDSDIR = '${project.home}'
OPENDSNAME = '${product.name}'
ZIPNAME = '${product.name}.zip'
ZIPPATH = '${product.package.dir}'
-TESTS_DIR = '${basedir}'
-TESTS_ROOT = '${basedir}/tests'
-TESTS_SHARED_DIR = '${basedir}/shared'
-TESTS_FUNCTIONS_DIR = '${basedir}/shared/functions'
-TESTS_DATA_DIR = '${basedir}/shared/data'
-TMP_DATA_DIR = '${tests.run.dir}/${tests.run.time}/data'
+TESTS_ROOT = '%s/tests' % OPENDSDIR
+TESTS_DIR = '%s/functional-tests' % TESTS_ROOT
+TESTS_SHARED_DIR = '%s/shared' % TESTS_DIR
+TESTS_FUNCTIONS_DIR = '%s/functions' % TESTS_SHARED_DIR
+TESTS_DATA_DIR = '%s/data' % TESTS_SHARED_DIR
+TMP_DATA_DIR = '%s/functional-tests' % TMPDIR
DIRECTORY_INSTANCE_DN = 'cn=Directory Manager'
DIRECTORY_INSTANCE_PSWD = 'password'
-DIRECTORY_INSTANCE_DIR = '${staf.tmp.dir}'
+DIRECTORY_INSTANCE_DIR = '%s' % TMPDIR
DIRECTORY_INSTANCE_HOST = 'localhost'
DIRECTORY_INSTANCE_PORT = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX = 'dc=com'
DIRECTORY_INSTANCE_BE = 'userRoot'
-STAGED_DATA_DIR = '${tests.run.dir}/${tests.run.time}/data/shared/data'
+STAGED_DATA_DIR = '%s/shared/data' % TMP_DATA_DIR
JAVA_HOME = '${java.home}'
SEND_MAIL_AFTER_TEST_RUN = '${staf.email.send}'
SEND_MAIL_TO = '${staf.email.to}'
--
Gitblit v1.10.0