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 +++++++-----
/dev/null | 2 --
opends/tests/oulu-tests/build.xml | 5 ++++-
opends/tests/installer.xml | 13 ++++++++-----
opends/PRODUCT | 4 ++--
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/opends/PRODUCT b/opends/PRODUCT
index 01d95b6..2a24051 100644
--- a/opends/PRODUCT
+++ b/opends/PRODUCT
@@ -8,7 +8,7 @@
MAJOR_VERSION=0
# The minor version number for the Directory Server. It must be an integer.
-MINOR_VERSION=1
+MINOR_VERSION=3
# The point version number for the Directory Server. It must be an integer.
# The point version will generally not be displayed to the end user but may be
@@ -21,7 +21,7 @@
# but may include additional text like "BETA1" or "SP2" for updates that do not
# warrant incrementing the major or minor version. However, the point version
# should be incremented every time a new qualifier is used.
-VERSION_QUALIFIER=
+VERSION_QUALIFIER=test
# A comma-delimited list of bug IDs for fixes included in this build. This
# should be set in any non-official build given to a customer to address a
diff --git a/opends/tests/installer.xml b/opends/tests/installer.xml
index de6faa0..a835583 100644
--- a/opends/tests/installer.xml
+++ b/opends/tests/installer.xml
@@ -34,11 +34,14 @@
<!-- this one has to be loaded first since it's used in
default.installer.properties
-->
- <property file="product.properties" />
- <!-- this is an optional file if you want to pass custom values -->
- <property file="installer.properties" />
- <!-- this is the file where the default values are defined -->
- <property file="default.installer.properties" />
+ <property file="../PRODUCT" />
+ <property name="product.name" value="${SHORT_NAME}" />
+ <property name="product.version"
+ value="${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_QUALIFIER}" />
+ <!-- this is an optional file if you want to pass custom values -->
+ <property file="installer.properties" />
+ <!-- this is the file where the default values are defined -->
+ <property file="default.installer.properties" />
<!-- Define default values for mandatory properties in case the
property files would not be found
-->
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>
diff --git a/opends/tests/oulu-tests/build.xml b/opends/tests/oulu-tests/build.xml
index 66dccd8..475a176 100644
--- a/opends/tests/oulu-tests/build.xml
+++ b/opends/tests/oulu-tests/build.xml
@@ -33,7 +33,10 @@
</description>
<property name="project.home.dir" value="${basedir}/../.." />
- <property file="../product.properties" />
+ <property file="../../PRODUCT" />
+ <property name="product.name" value="${SHORT_NAME}" />
+ <property name="product.version"
+ value="${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_QUALIFIER}" />
<!-- in case there's a custom installer properties file -->
<property file="../installer.properties" />
<!-- in case there isn't - load default values -->
diff --git a/opends/tests/product.properties b/opends/tests/product.properties
deleted file mode 100644
index 72d69b8..0000000
--- a/opends/tests/product.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-product.name=OpenDS
-product.version=0.1
--
Gitblit v1.10.0