From d1f8ce7a3cc1ba49f2d0d9b17c51e343ebfc435f Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Sat, 28 Oct 2006 17:45:09 +0000
Subject: [PATCH] Removed reference to duplicate product properties file Removed the afore mentioned file also Changed build files to reflect the change and point to root dir PRODUCT file fixed the product version to allow the tests to work on the daily builds
---
opends/tests/integration-tests-testng/build.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opends/tests/integration-tests-testng/build.xml b/opends/tests/integration-tests-testng/build.xml
index b7195bf..5e13bfc 100644
--- a/opends/tests/integration-tests-testng/build.xml
+++ b/opends/tests/integration-tests-testng/build.xml
@@ -37,15 +37,17 @@
<format property="run.time" pattern="yyyy.MM.dd-HH.mm.ss" />
</tstamp>
- <property file="../product.properties" />
+ <property file="../../PRODUCT" />
+ <property name="product.version"
+ value="${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_QUALIFIER}" />
<!-- in case there's a custom installer properties file -->
- <property file="../installer.properties" />
+ <property file="../installer.properties" />
<!-- in case there isn't - load default values -->
<property file="../default.installer.properties" />
<!-- General build-wide properties -->
<property name="opends.dir" location="../.." />
- <property name="tests.src.dir" location="${basedir}/src/server" />
+ <property name="tests.src.dir" location="${basedir}/src/server" />
<property name="tests.build.dir"
location="${opends.dir}/build/integration-tests" />
<property name="tests.classes"
@@ -249,7 +251,7 @@
<!-- convert the testng results to junit -->
<junitreport todir="${tests.run.dir}/reports/junit">
- <fileset dir="${tests.run.dir}/reports/testng/${product.name}">
+ <fileset dir="${tests.run.dir}/reports/testng/${SHORT_NAME}">
<include name="integration-tests.xml"/>
</fileset>
</junitreport>
@@ -259,7 +261,7 @@
<delete dir="${tests.run.dir}/backup" />
<!-- save the server log files for issues investigation -->
<copy todir="${tests.run.dir}/logs/server">
- <fileset dir="${opends.dir}/build/install/${product.name}-${product.version}/logs"/>
+ <fileset dir="${opends.dir}/build/install/${SHORT_NAME}-${product.version}/logs"/>
</copy>
--
Gitblit v1.10.0