From dfde4b286694fd2bf3a44df2ad01d1d22e6a7728 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Tue, 24 Oct 2006 15:19:31 +0000
Subject: [PATCH] added usage to the ant build file added more comprehensive proxy config added the backup of the server logs after each test suite has run
---
opendj-sdk/opends/tests/oulu-tests/oulu.properties | 9 +++++++--
opendj-sdk/opends/tests/oulu-tests/build.xml | 38 +++++++++++++++++++++++++++++++++++---
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/tests/oulu-tests/build.xml b/opendj-sdk/opends/tests/oulu-tests/build.xml
index 00cc5ca..66dccd8 100644
--- a/opendj-sdk/opends/tests/oulu-tests/build.xml
+++ b/opendj-sdk/opends/tests/oulu-tests/build.xml
@@ -46,7 +46,27 @@
<target name="usage">
<echo>Usage for oulu test suite:
+ [all]
+ bootstrap a fresh instance of ${product.name}
+ run the oulu tests
+ wipeout the {{product.name} instance
+ [get-bits]
+ Download the bits from oulu university server
+ NOTE: if you are behind a proxy, you need to edit oulu.properties
+ and set proxy.host and proxy.port to relfect that.
+
+ [pdu-tests]
+ run the application exceptions robustness test suite
+
+ [ber-tests]
+ run the encryption exceptions robustness test suite
+
+ [bootstrap]
+ install, configure and start an ${product.name} instance
+
+ [wipeout]
+ stop and uninstall a previously bootstraped ${product.name} instance
</echo>
</target>
@@ -55,7 +75,12 @@
<delete dir="${oulu.build.dir}" />
<mkdir dir="${oulu.build.dir}" />
<echo message="Downloading oulu bits ..." />
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" />
+ <setproxy proxyhost="${proxy..http.host}"
+ proxyport="${proxy.http.port}"
+ proxyuser="${proxy.http.user}"
+ proxypassword="${proxy.http.pwd}"
+ socksproxyhost="${proxy.socks.host}"
+ socksproxyport="${proxy.socks.port}"/>
<get
src="${oulu.home.url}/${oulu.ber.jar}"
dest="${oulu.build.dir}/${oulu.ber.jar}"
@@ -90,7 +115,6 @@
<!-- installer related targets -->
<target name="bootstrap">
- <echo message="basedir=[${basedir}]" />
<ant
antfile="installer.xml"
dir=".."
@@ -120,6 +144,10 @@
<arg value="15" />
<!-- <arg value="-showreply" /> -->
</java>
+ <mkdir dir="${oulu.build.dir}/server-logs/pdu-tests" />
+ <copy todir="${oulu.build.dir}/server-logs/pdu-tests">
+ <fileset dir="${project.home.dir}/build/install/${product.name}-${product.version}/logs"/>
+ </copy>
</target>
<target name="ber-tests">
<java
@@ -133,12 +161,16 @@
<arg value="-delay" />
<arg value="15" />
</java>
+ <mkdir dir="${oulu.build.dir}/server-logs/ber-tests" />
+ <copy todir="${oulu.build.dir}/server-logs/ber-tests">
+ <fileset dir="${project.home.dir}/build/install/${product.name}-${product.version}/logs"/>
+ </copy>
</target>
<!-- end of test related targets -->
<!-- macros - chained targets -->
<target name="all" >
- <antcall target="boostrap" />
+ <antcall target="bootstrap" />
<antcall target="get-bits" />
<antcall target="pdu-tests" />
<antcall target="ber-tests" />
diff --git a/opendj-sdk/opends/tests/oulu-tests/oulu.properties b/opendj-sdk/opends/tests/oulu-tests/oulu.properties
index 0ab07db..38799f6 100644
--- a/opendj-sdk/opends/tests/oulu-tests/oulu.properties
+++ b/opendj-sdk/opends/tests/oulu-tests/oulu.properties
@@ -4,5 +4,10 @@
oulu.ber.pgp=c06-ldapv3-enc-r1.jar.asc
oulu.pdu.jar=c06-ldapv3-app-r1.jar
oulu.pdu.pgp=c06-ldapv3-app-r1.jar.asc
-proxy.host=
-proxy.port=
+<!-- proxy section - edit this to reflect how your network is set up -->
+proxy.http.host=
+proxy.http.port=
+proxy.http.user=
+proxy.http.pwd=
+proxy.socks.host=
+proxy.socks.port=
--
Gitblit v1.10.0