You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2005/06/03 19:48:37 UTC
svn commit: r179840 - in
/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/errorStream.out suites/derbylang.runall
tests/lang/errorStream_sed.properties
Author: kmarsden
Date: Fri Jun 3 10:48:36 2005
New Revision: 179840
URL: http://svn.apache.org/viewcvs?rev=179840&view=rev
Log:
This patch is a follow-up to the new test (lang/errorStream.java)
introduced by derby-205 (second patch). Its sed script was deficient,
so the test was not initially included in the suites. This patch:
- eliminates a Unix dependency in its canon file
- eliminates a locale dependent string in the canon file
- adds the test to the derbylang suite
Note: the test will fail on second run if the test directory is not cleaned up.
Contributed by Dag Wanvik
Modified:
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorStream.out
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_sed.properties
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorStream.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorStream.out?rev=179840&r1=179839&r2=179840&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorStream.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/errorStream.out Fri Jun 3 10:48:36 2005
@@ -1,10 +1,10 @@
Test errorStream starting
shutdown ok: XJ015:Derby system shutdown.
-xxxxxxFILTERED-TIMESTAMPxxxxxGMT Thread[main,5,main] java.io.FileNotFoundException: xxxFILTERED_PATHxxx/VombatusUrsinusHirsutus-file-2.log (No such file or directory)
+xxxxxxFILTERED-TIMESTAMPxxxxxGMT Thread[main,5,main] java.io.FileNotFoundException: xxxFILTERED_PATHxxx VombatusUrsinusHirsutus-file-2.log
----------------------------------------------------------------
xxxxxxFILTERED-TIMESTAMPxxxxxGMT:
Booting Derby: xxxFILTERED_VERSIONxxx
-on database directory xxxFILTERED_PATHxxx/VombatusUrsinusHirsutus-2
+on database directory xxxFILTERED_PATHxxx VombatusUrsinusHirsutus-2
Database Class Loader started - derby.database.classpath=''
xxxxxxFILTERED-TIMESTAMPxxxxxGMT:
Shutting down instance xxxxFILTERED-UUIDxxxx
@@ -15,7 +15,7 @@
----------------------------------------------------------------
xxxxxxFILTERED-TIMESTAMPxxxxxGMT:
Booting Derby: xxxFILTERED_VERSIONxxx
-on database directory xxxFILTERED_PATHxxx/VombatusUrsinusHirsutus-4
+on database directory xxxFILTERED_PATHxxx VombatusUrsinusHirsutus-4
Database Class Loader started - derby.database.classpath=''
xxxxxxFILTERED-TIMESTAMPxxxxxGMT:
Shutting down instance xxxxFILTERED-UUIDxxxx
@@ -26,7 +26,7 @@
----------------------------------------------------------------
xxxxxxFILTERED-TIMESTAMPxxxxxGMT:
Booting Derby: xxxFILTERED_VERSIONxxx
-on database directory xxxFILTERED_PATHxxx/VombatusUrsinusHirsutus-6
+on database directory xxxFILTERED_PATHxxx VombatusUrsinusHirsutus-6
Database Class Loader started - derby.database.classpath=''
xxxxxxFILTERED-TIMESTAMPxxxxxGMT:
Shutting down instance xxxxFILTERED-UUIDxxxx
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?rev=179840&r1=179839&r2=179840&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall Fri Jun 3 10:48:36 2005
@@ -56,6 +56,7 @@
lang/ejbql_nonSPS.sql
lang/emptyStatistics.sql
lang/errorCode.sql
+lang/errorStream.java
lang/fk_nonSPS.sql
lang/floattypes.sql
lang/forbitdata.java
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_sed.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_sed.properties?rev=179840&r1=179839&r2=179840&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_sed.properties (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/errorStream_sed.properties Fri Jun 3 10:48:36 2005
@@ -7,4 +7,4 @@
# substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
# No commas or semicolons can be allowed in the patterns/subsitutes.
---------------------------------------------------------------------------------
-substitute=Booting Derby.*;Booting Derby: xxxFILTERED_VERSIONxxx,FileNotFoundException: .*VombatusUrsinusHirsutus-file-2.log;FileNotFoundException: xxxFILTERED_PATHxxx/VombatusUrsinusHirsutus-file-2.log,on database directory .*/VombatusUrsinusHirsutus;on database directory xxxFILTERED_PATHxxx/VombatusUrsinusHirsutus
+substitute=Booting Derby.*;Booting Derby: xxxFILTERED_VERSIONxxx,FileNotFoundException: .*VombatusUrsinusHirsutus-file-2.log.*;FileNotFoundException: xxxFILTERED_PATHxxx VombatusUrsinusHirsutus-file-2.log,on database directory .*VombatusUrsinusHirsutus;on database directory xxxFILTERED_PATHxxx VombatusUrsinusHirsutus