From 21dd2433ff21bd262347ffc6e2755838e41a0e72 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 6 Sep 2007 18:58:20 +0000
Subject: [PATCH] StackTrace2.jar: Rebuilt.

	* testsuite/libjava.lang/StackTrace2.jar: Rebuilt.
	* testsuite/libjava.lang/StackTrace2.java (checkLine): Print file
	name.

From-SVN: r128203
---
 libjava/ChangeLog                             |   6 ++++++
 .../testsuite/libjava.lang/StackTrace2.jar    | Bin 1775 -> 1990 bytes
 .../testsuite/libjava.lang/StackTrace2.java   |   5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ab17f017cac..a9458e94859 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-06  Tom Tromey  <tromey@redhat.com>
+
+	* testsuite/libjava.lang/StackTrace2.jar: Rebuilt.
+	* testsuite/libjava.lang/StackTrace2.java (checkLine): Print file
+	name.
+
 2007-09-06  Roman Zippel  <zippel@linux-m68k.org>
 
 	* sysdep/m68k/locks.h: New file.
diff --git a/libjava/testsuite/libjava.lang/StackTrace2.jar b/libjava/testsuite/libjava.lang/StackTrace2.jar
index fc289f1da796cb70af5c137226446144b751c7e7..edb8f0e2e743116ca28474b22300272e9b003ac8 100644
GIT binary patch
delta 1663
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
JvjzYF000jG`Gf!f

delta 1459
zcmZA1do&XY90%~R8DaCBM=`IM3M&lB`^`M&5!VWL%r3PwAxX?m4{swhDulS+NoXlE
zme(QFyk995hTO`#;l?@l+;jS!^ZR|z`TqI)<I^Fs0)b-CK#(9{f83&!^)jF;po2tV
zq5DZ{kxv}~0szb4jJzXctgYm(6eXHcshl{zUEF?OH%>hj<)pIZ8gNp{-05ZmDwyqy
z1Io}bbo@ISW9=!~tP~m3<(SXrZ|HXP)n@mtQaP&=LP>TNeM|W-f5yx`-092zTtN0~
z<{`lYAzBo(VZAV_K8N7kcabCnitI%Yiip_TueaCJddGOD$vvu-ct6;DvXwsHWY5s6
z)nXA7Ap9C1SVt9IgE}!$$H0ZqRFz=Q@P|^Y;CREYbyu75u)A-aOhI5_;o~(YcVya*
zL6j)&@<dLs^YD_}kT&Tsi+6`FI8qxXU|Td*Bhu&==$&yd&*PL0<W>9zANNI(5#HI_
zS<OZtl_EqImVf)%al8&cMLo57V-tXbC|q60+9}8NBvFptuu83Pa?qPha;;GN`hCE$
zS?i618%vfDaXw@5joWGDqM=D?mh)?pH<s_E3`2Z9;INo#SeA*(id5KP9q`ATz`|av
z6E=#HXlFPM4C%B#Zqvp@7$6@_3=Nku7wnL?M_tIF=BzgJ&?XW5j81lrr#m_j-APYF
zbNjq#i-h8`3+cKfSufBHXUL$nn4PtAmDy#f<`WC^rBEuAmS!%`V|p*+9m(=fE~p>u
zIhYHXF8N$H7F3lBo1Q&KuU4A!!5|VSXSy&RTLEkh{j`PmoK*ZO!!76yvq`*dR-kZ}
zjJ|%(+u^UaXSl6;n}@w;vU@8GFA4NAD(~){L&_5kHQ`zw%k8ykmq&HOILr-*5oXS{
z`RVaxf7BD`<JmL3Qm~n5ped8cW2nig55+Fe34hAI3E1#*2plUi_5W_GwfE2gZR^Tx
zh>dT~s@7XPT|VRSE?C$WZBH@kLrlbxl^*RH)o)sm1~*aN-ep6h@Ku`bd}{HCcQ`8^
zkfIk}zU&{Qu!9^Z$Q`pLp%~N*8kA0bT&NdwOU$eXU3Z74EK;@0$EO*2DUuBp8t@Gu
zib&**#?lR-5(XB$3dwq{1e2sIiz1GUj#bb3C3s)^^pbL8@(Z8d&h0Oj(qzj5{=e6s
z%7mTxd4XgxmcKR7Fd*HE3yjWgmRx0jwUP_an31y)!(m;Iidu^6(7PWLR(b{pDiU%i
z54u`pzZp`=KV-Lag{z084WiSBeM;L)q6?oGs2@cjSZ9?j{KCF`^yH?)S4ujm1J9f0
z-#5;SkXdE-)ySPPbIa-BlVpgx9R(}*L*G6F$~88UtWsebo6K|O5OGn0EzDWJ8G2kY
zx8)9+o@!0RB#4&;kz(713POP`insm7nEmQQVUNEdGA^IqYuAbpgQQVwXC=>K2$ar&
zJ>Y)|2plK?%KpPajt2ms{aWc?GPsB10xo)7$@JzECHuHIp;>04F`4yFO&zg8i_(Hv
zqk5Re_3CSf1T5ZKCg(q2aAS8sh;Dl{njoCZv#TE3Bq$Y$BTV<c%8e@UTTuXL)vmNE
z4aUDn`J$qt5)pO1vOyazcx&8|(dDbWRv&4aU#^bGs_~bf8v#9^ic*wp3oinl&jL!i
ziYpSyAc0!@f7F75@atAVjr@E3YhIr?io=|cZ$_Skqn(L)?n0POsn&irF2vthRd+lO
zwd>O8BFYNKDMv^kl8`<UB*q0bkf&`<mxg<8ybps|ortNAko(cC<=Ous0ad#u6QK#V
z+JMB;?ukB05r8$qdJN2X;?-vpo>gtqMzs7_YLR)Gt})zMfd|GPAew27%M9@SMhk9a
zE&tvT44Q{m5b(dJnJlo*0jQbVV3XfO&9vb^rMQpm@9#d)_~0aiGBJFznYH|);7Pvy
F=3lRzjFbQX

diff --git a/libjava/testsuite/libjava.lang/StackTrace2.java b/libjava/testsuite/libjava.lang/StackTrace2.java
index e06db0cc992..4a69409815e 100644
--- a/libjava/testsuite/libjava.lang/StackTrace2.java
+++ b/libjava/testsuite/libjava.lang/StackTrace2.java
@@ -70,7 +70,8 @@ public class StackTrace2
             && frame.getFileName().equals("StackTrace2.java")))
       System.out.println("OK");
     else
-      System.out.println("FAIL - expected " + expected_line + ", got: " +
-			 frame.getLineNumber());
+      System.out.println("FAIL - expected " + expected_line + ", got: "
+			 + frame.getLineNumber() + ", in file "
+			 + frame.getFileName());
   }
 }
-- 
2.30.2