Here's the attachment...for real this time.
Hi list-eners,
Attached is the update of the README reflecting the addition of the
nist, encryption, demo, and - not yet committed - multi test suite.
I've also documented in Note 1 the addition of the test suite for
DerbyNetClient - which no one except the folks working on contributing
that driver can run yet (hence mention in the note).
I also modified the RunTest.java harness file once again - this time
to rename the 'no<framework>.runall' files to <framework>.exclude.
This to show better that these suites are not really suites at all,
but lists of specific tests to be skipped with a specific framework.
I've also updated the README to document this skipping mechanism.
Note that although this patch includes a README that assumes that my
previous patch on the multi test suite has been committed, it also
includes changes to RunTest.java which do not reflect the changed
state after the patch for the multi test suite.
So, whomever commits these 2 patches will have to be careful with
RunTest.java & make sure it's all merging.
Thx,
Myrna
Index: java/testing/README.htm
===================================================================
--- java/testing/README.htm (revision 151385)
+++ java/testing/README.htm (working copy)
@@ -322,6 +322,35 @@
<li>takes 2 to 5 minutes<br>
</li>
</ul>
+ <li>demo, simpledemo<br>
+ </li>
+ <ul>
+ <li>tests the SimpleApp example <br>
+ </li>
+ <li>simpledemo runs SimpleApp itself - and thus has a different
+default resource package name (namely, no package) than all the other
+tests. Hence it needed its own suite.properties file.</li>
+ <li>takes 30 to 1 minute</li>
+ </ul>
+ <li>nist</li>
+ <ul>
+ <li>test obtained from the NIST SQL suite v 6.0</li>
+ <li>takes 5 to 10 minutes<br>
+ </li>
+ </ul>
+ <li>encryption</li>
+ <ul>
+ <li>runs the storemats suite in encryption scheme DESede<br>
+ </li>
+ <li>takes 25 to 40 minutes<br>
+ </li>
+ </ul>
+ <li>multi</li>
+ <ul>
+ <li>runs a simple test case with 10 threads</li>
+ <li>runs for 10 minutes, then shuts down all threads<br>
+ </li>
+ </ul>
<li>derbytools<br>
</li>
<ul>
@@ -335,7 +364,7 @@
</li>
</ul>
<ul>
- <li>tested on a variety of hardware takes from 2 - 4.30 hours </li>
+ <li>tested on a variety of hardware takes from 2.30 - 5.00 hours </li>
</ul>
<li><a href="#Note1:"><small>See Note1</small></a><br>
</li>
@@ -945,8 +974,10 @@
</ul>
<br>
<h3><a name="skipping"></a>4.10 Skipping a test</h3>
-<p>
-Some tests are written to test specific functionality only available
+<p>There are 2 skipping mechanisms in place for different kinds of
+skipping of a test.<br>
+</p>
+<p>Some tests are written to test specific functionality only available
with for instance certain jvms, or, with network server, certain
versions of the IBM Universal Driver. To control this, properties can
be set for each test, for instance, if a test should not be run when
@@ -957,6 +988,19 @@
runs with jdk141 as well as jdk142.<br>
Other skip reasons are encryption protocols specific to a certain jvm. <br>
</p>
+<p>Another skipping mechanism works on entire 'frameworks'. Currently
+there are only 3 supported in the harness, embedded, NetworkServer with
+the IBM Universal JDBC Driver ('DerbyNet') and NetworkServer with the
+not yet available new driver ('DerbyNetClient'). In the suites
+directory there are .exclude files for each of the frameworks - if for
+some reason an exclude file were not there, you would see a warning
+message show up for every test run. In this 'framework'.exclude file
+tests can be placed that for some reason need to be excluded from
+running with that framework. This mechanism enables adding of suites to
+a framework run even if a few of the tests are not appropriate for that
+particular framework.</p>
+<p>Note that at this time, only skipped suites show up in the .skip
+result file. This still needs to be corrected.</p>
<br>
<h3><a name="frameworks"></a>4.11 Frameworks</h3>
<p>
@@ -1033,9 +1077,14 @@
this suite requires providing the property bootcp,
which is interpreted from the test harness class j9_13. See also
section on adding a new <a href="#ov9%22">jvm setup</a>.
-</small><br>
-</div>
<br>
+Another suite is derbynetclientmats. This suite is for testing the
+networkserver with a yet to be contributed open source client. IBM
+staff is working on contributing this. In essence it is the same as the
+derbynetmats suite. At this time, it can only be run by the IBM
+staff working on this driver.<br>
+</small></div>
+<br>
<small><a name="Note2:"></a>Note2:<br>
</small>
<div style="margin-left: 40px;"><small>setting
Index: java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(revision 151385)
+++ java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(working copy)
@@ -815,7 +815,7 @@
String skipFile;
// Some tests will not work with some frameworks,
// so check property files for tests to be skipped
- skipFile = "no" + framework + ".runall";
+ skipFile = framework + ".exclude";
if (!framework.equals(""))
{
Index: java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
(revision 151385)
+++ java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
(working copy)
@@ -24,7 +24,7 @@
<target name="copyfiles">
<copy todir="${out.dir}/${derby.testing.suites.dir}">
- <fileset
dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/suites"
includes="*.runall,*.properties"/>
+ <fileset
dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/suites"
includes="*.runall,*.properties,*.exclude"/>
</copy>
</target>
Index:
java/testing/org/apache/derbyTesting/functionTests/suites/noembedded.runall
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/suites/noembedded.runall
(revision 151385)
+++ java/testing/org/apache/derbyTesting/functionTests/suites/noembedded.runall
(working copy)
@@ -1 +0,0 @@
-
Index:
java/testing/org/apache/derbyTesting/functionTests/suites/noDerbyNetClient.runall
===================================================================
---
java/testing/org/apache/derbyTesting/functionTests/suites/noDerbyNetClient.runall
(revision 151385)
+++
java/testing/org/apache/derbyTesting/functionTests/suites/noDerbyNetClient.runall
(working copy)
@@ -1,9 +0,0 @@
-derbynet/dataSourcePermissions_net.java
-# excluding resultsetStream.java because this test uses
java.io.FileInputStream throughout the test
-# excluding scrollCursors2.java because updatable resultsets & scroll
sensitive cursors are not supported
-# excluding batchUpdate.java for it hits a problem in networkserver ('beetle'
5561)
-# excluding statementJdbc20.java because this tests fetch_reverse throughout
the test
-jdbcapi/resultsetStream.java
-lang/scrollCursors2.java
-jdbcapi/batchUpdate.java
-jdbcapi/statementJdbc20.java
Index:
java/testing/org/apache/derbyTesting/functionTests/suites/noDerbyNet.runall
===================================================================
--- java/testing/org/apache/derbyTesting/functionTests/suites/noDerbyNet.runall
(revision 151385)
+++ java/testing/org/apache/derbyTesting/functionTests/suites/noDerbyNet.runall
(working copy)
@@ -1,8 +0,0 @@
-# excluding resultsetStream.java because this test uses
java.io.FileInputStream throughout the test
-# excluding scrollCursors2.java because updatable resultsets & scroll
sensitive cursors are not supported
-# excluding batchUpdate.java for it hits a problem in networkserver ('beetle'
5561)
-# excluding statementJdbc20.java because this tests fetch_reverse throughout
the test
-jdbcapi/resultsetStream.java
-lang/scrollCursors2.java
-jdbcapi/batchUpdate.java
-jdbcapi/statementJdbc20.java
