From c85ed4862f92c9d97d8726dc5abdfa11340e817e Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 18 Mar 2009 16:00:44 +0000
Subject: [PATCH] Fix for issue 3116 => Save tests logs under functional-run/run//report
---
opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml | 4 ++--
opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
index 901da8d..aecfe03 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
@@ -101,8 +101,8 @@
<delete dir="${staf.install.dir}/logs"/>
<echo>Saving report</echo>
<copy todir="${tests.run.dir}/${tests.run.time}/report">
- <fileset dir="${tests.tmp.dir}">
- <include name="r*"/>
+ <fileset dir="${tests.tmp.dir}/${tests.run.time}">
+ <include name="**"/>
</fileset>
</copy>
<delete file="${tests.tmp.dir}/percentage.properties"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
index a7a08b3..4a6ed67 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
@@ -413,7 +413,7 @@
<!-- Set variables to build unique path to store data -->
<script>
# Private
- logsDate=strftime("%Y%m%d-%H%M%S",localtime())
+ logsDate= '%s' % TESTS_RUN_TIME
logsArch=\
DSInfo.getServerArch(DSInfo.ServerDict['system os'])
logsOSName=\
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
index 7995b3f..bd072b9 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -33,6 +33,7 @@
OPENDSNAME = '${product.name}'
ZIPNAME = '${product.name}.zip'
ZIPPATH = '${opends.dir}'
+TESTS_RUN_TIME = '${tests.run.time}'
TESTS_TYPE = '${tests.type}'
TESTS_ROOT = '%s/tests/staf-tests' % OPENDSDIR
TESTS_DIR = '%s/%s' % (TESTS_ROOT, TESTS_TYPE)
--
Gitblit v1.10.0