Author: myrnavl
Date: Tue Apr 12 05:01:04 2011
New Revision: 1091291

URL: http://svn.apache.org/viewvc?rev=1091291&view=rev
Log:
DERBY-5186; dblook_test_territory.java fails on AIX with ibm 1.4.2 diffing on 1 line not removed from .out
  backport of revision 1091159 from trunk, adding 1 line to Sed.java.
  merge command: svn merge -c 1091159 https://svn.apache.org/repos/asf/db/derby/code/trunk

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:01:04 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=1091291&r1=1091290&r2=1091291&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java Tue Apr 12 05:01:04 2011
@@ -83,6 +83,7 @@ public class Sed
         deleteLines.addElement("^(.*at .*)\\(.*:[0-9].*\\)$");
         deleteLines.addElement("^(.*at .*)\\(*.java\\)$");
         deleteLines.addElement("^(.*at .*)\\(Compiled Code\\)$");
+        deleteLines.addElement("^.*at java.*\\<init\\>\\(.*\\(Compiled Code\\)\\)$");
         deleteLines.addElement("^(.*at .*)\\(Interpreted Code\\)$");
         deleteLines.addElement("^(.*at .*)\\(Unknown Source\\)$");
         deleteLines.addElement("^(.*at .*)\\(Native Method\\)$");