Mailing-List: contact river-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: river-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1032999 -
 /incubator/river/site/trunk/content/building-river.mdtext
Date: Tue, 09 Nov 2010 14:49:06 -0000
To: river-commits@incubator.apache.org
From: thobbs@apache.org
Message-Id: <20101109144906.11A3823888E4@eris.apache.org>

Author: thobbs
Date: Tue Nov  9 14:49:05 2010
New Revision: 1032999

URL: http://svn.apache.org/viewvc?rev=1032999&view=rev
Log:
Tidied up description of how to run the tests

Modified:
    incubator/river/site/trunk/content/building-river.mdtext

Modified: incubator/river/site/trunk/content/building-river.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/building-river.mdtext?rev=1032999&r1=1032998&r2=1032999&view=diff
==============================================================================
--- incubator/river/site/trunk/content/building-river.mdtext (original)
+++ incubator/river/site/trunk/content/building-river.mdtext Tue Nov  9 14:49:05 2010
@@ -20,8 +20,7 @@ Notice:    Licensed to the Apache Softwa
 
 Before you can start building River a word of warning;
 
-> The build process does not place nicely if you have spaces in your
-> path names
+**The build process does not place nicely if you have spaces in your path names**
 
 So Windows users please be particular aware.  Also, where path separators are specified colons (:) should be used in preference to semi-colons (;)  even on Windows.
 
@@ -44,9 +43,27 @@ Will build all the River JARs required. 
 
 This build process runs the (limited) suite of unit tests that comes with River.  River is tested predominantly by using [jtreg](http://openjdk.java.net/jtreg/).
 
-You must first download and install jtreg following the instructions on their site.
+### Using the Ant script
+
+The QA tests can also be run from the Ant script.
+
+Make sure that you have the following in your build.properties file.
+
+    river.home=$RIVER_HOME
+    jtreg.home=/path/to/jtreg/install
+    jdk1.5.home=/path/to/java1.5 
+    jtreg.dir=$RIVER_HOME/jtsk/qa/jtreg
+
+Execute the following:
 
-*I believe the following is not 100% correct yet.*
+    cd $RIVER_HOME
+    cd qa.run
+
+The specific tests and categories of test which are run is set by **doing something which I can't remember**.
+
+### Using jtreg directly
+
+You must first download and install jtreg following the instructions on their site.
 
 Execute the following:
 
@@ -75,45 +92,4 @@ Then to run the jtreg tests execute the 
          -Djtlib.tmp=./qa/jtreg/JTlib-tmp \
          ./qa/jtreg/
 
-*The following should be ignored, it has not been edited or checked yet.*
-
-create a file in the trunk directory called "build.properties"
-
-Then define the following properties in that file:
-
-river.home="file path to trunk"
-jtreg.home="path to jtreg install directory"
-jdk1.5.home="path to jdk1.5 directory"  eg: jdk1.5.home="/usr/jdk/jdk1.5.0_15"
-jtreg.dir=C:\apache\river\jtsk\qa\jtreg
-
-Then in a directory relative to the one you choose for your working directory, you must add a file named test.props
-
-the correct location for test.props:
->
-> /**
-> * Returns extra test properties. Looks for the file "../../test.props"
-> * and reads it in as a Properties file. Assuming the working directory
-> * is "<path>/JTwork/scratch", this will find "<path>/test.props".
-> */
-
-My test.props contains the following two lines:
-
-jsk.home=/opt/src/river/trunk
-javatest.maxOutputSize=500000
-
-$jtreg -verbose:all,nopass -cpa: /opt/src/river/trunk/lib-platform -jdk /usr/jdk/jdk1.5.0_15 -Djsk.home="/opt/src/river/trunk" -Djava.security.debug=access,failure -Djavatest.maxOutputSize=500000 ./qa/jtreg/
-
-To run the tests manually, do the following:
-
- 1. Copy the following files to JTlib-tmp; jsk-lib.jar,
-    jsk-platform.jar, jsk-resources.jar, phoenix-init.jar, jsk-policy.jar
- 2. Execute the following jtreg command from the trunk directory,
-    change the paths to suit your environment.
- 3. $ jtreg -verbose:all,nopass
-    -cpa:./qa/jtreg/JTlib-tmp/jsk.lib.jar:./qa/jtreg/JTlib-tmp/jsk-platform.jar:./qa/jtreg/JTlib-tmp/jsk-resources.jar:./qa/jtreg/JTlib-tmp/phoenix-init.jar:.jsk-policy.jar
-    -jdk /usr/jdk/jdk1.5.0_15 -Djsk.home="/opt/src/river/trunk"
-    -Djava.security.debug=access,failure
-    -Djavatest.maxOutputSize=500000 -Djtlib.tmp=./qa/jtreg/JTlib-tmp
-    ./qa/jtreg/
-
-c:/apache/jtreg/win32/bin/jtreg "-verbose:all,nopass" "-cpa:./qa/jtreg/JTlib-tmp/jsk.lib.jar:./qa/jtreg/JTlib-tmp/jsk-platform.jar:./qa/jtreg/JTlib-tmp/jsk-resources.jar:./qa/jtreg/JTlib-tmp/phoenix-init.jar:.jsk-policy.jar:./qa/jtreg/JTlib-tmp/sun-util.jar" -jdk "c:/Program Files/Java/jdk1.6.0_20" -Djsk.home="c:/apache/river/jtsk/trunk" -Djava.security.debug=access,failure  -Djavatest.maxOutputSize=500000 -Djtlib.tmp=./qa/jtreg/JTlib-tmp ./qa/jtreg/
+The specific tests and categories of test which are run is set by **doing something which I can't remember**.
\ No newline at end of file