From: Bjorn Munch
Date: January 6 2011 2:21pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2963) Bug#59002
List-Archive: http://lists.mysql.com/commits/128082
X-Bug: 59002
Message-Id: <201101061421.p06ELivo007257@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1769243599=="

--===============1769243599==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/lineno-51/ based on revid:bjorn.munch@stripped

 2963 Bjorn Munch	2011-01-06
      Bug #59002 Please make mtr print correct file and line number when tests fail
      This patchs adds printing of a file stack (with line numbers)
      It does not fix the problem of a failure in the non-first iteration of a loop

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-12-29 15:01:07 +0000
+++ b/client/mysqltest.cc	2011-01-06 14:19:43 +0000
@@ -1238,6 +1238,17 @@ static void cleanup_and_exit(int exit_co
   exit(exit_code);
 }
 
+void print_file_stack()
+{
+  for (struct st_test_file* err_file= cur_file;
+       err_file != file_stack;
+       err_file--)
+  {
+    fprintf(stderr, "included from %s at line %d:\n",
+            err_file->file_name, err_file->lineno);
+  }
+}
+
 void die(const char *fmt, ...)
 {
   static int dying= 0;
@@ -1257,8 +1268,12 @@ void die(const char *fmt, ...)
   /* Print the error message */
   fprintf(stderr, "mysqltest: ");
   if (cur_file && cur_file != file_stack)
-    fprintf(stderr, "In included file \"%s\": ",
+  {
+    fprintf(stderr, "In included file \"%s\": \n",
             cur_file->file_name);
+    print_file_stack();
+  }
+  
   if (start_lineno > 0)
     fprintf(stderr, "At line %u: ", start_lineno);
   if (fmt)
@@ -1288,20 +1303,14 @@ void die(const char *fmt, ...)
 void abort_not_supported_test(const char *fmt, ...)
 {
   va_list args;
-  struct st_test_file* err_file= cur_file;
   DBUG_ENTER("abort_not_supported_test");
 
   /* Print include filestack */
   fprintf(stderr, "The test '%s' is not supported by this installation\n",
           file_stack->file_name);
   fprintf(stderr, "Detected in file %s at line %d\n",
-          err_file->file_name, err_file->lineno);
-  while (err_file != file_stack)
-  {
-    err_file--;
-    fprintf(stderr, "included from %s at line %d\n",
-            err_file->file_name, err_file->lineno);
-  }
+          cur_file->file_name, cur_file->lineno);
+  print_file_stack();
 
   /* Print error message */
   va_start(args, fmt);


--===============1769243599==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/lineno-51/
# testament_sha1: c6b244205ab4394ec1fbf2a15b3fd4af0e6bd8d6
# timestamp: 2011-01-06 15:21:44 +0100
# base_revision_id: bjorn.munch@stripped\
#   i4efnfyrucnc2klo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTp+z0IAAeDfgElQenf//1Ii
RAS////6UASOuyd5GY9dMu82LwyRNNJPGiaj9JianqHqaaHpqAAMgHqCUk0mynpiNU3pGUeppoAA
AAAAJIQmp6TFNPU1D0NI9IxNBoDTQxAyCRSnkCT1PUwm1DQ0ZAGgaaBoAAkkmmgNTVPxT1T2g1Ho
1QeSekAAAHqMJys44p2Lu9cR211x5C2IWyQLXUoRC5c6emcG9CPfNeuaEqoSlVGmzCkpNJoXfsGm
HpR7asnjebYvXUXviVMYKCFE0IFbEgD0fpbtjjz9dx+VpNT3KVjBt3MU1q7av5ohdCIy0TNjXscX
Ho46UfRhFZl73QN4VuRsz2723nx77zWPK0JtNV7KhdGaMeDQdDeGkwECd3y0RiniF+/4A5QLDcyC
tdsypSKEjA5rmKbNMhs22szhwkjlkRGQSBxekHE6IwHE4wfXQbpXeIpKi4LUjO2ChlPC3DUKCYOZ
hHtL+i0hRLTASSKPE8/QY3LUrBPM5nyBhKd2qu4SZCL1zcskNGmM9QJNwcBCUg9gx6jgqa4Im4kv
YLxVOLOIWX0lULhUOHNKOrgdm2OsK+QvHMTlSRAW1t2RHF8LENiTK20JH4FLYtB1UJ4vFBbYM8Ly
MivQ69S4aXC7RFYGusqiUzZKSTQyKHEHBMXQrRnyZcqTeVyf/EKHlEEwEuYXPKlKgwry0toQKBFM
zVCRszUO4lWPu0va63NKlC11ClGnLGCbpqNMqF1zfDXk63+ol2c78+9jDmr8ezcHSkUvZMd24iss
Rm97T6MmSZZNVKloIBrlnINuvyjDX8dCjmwakiQqri8O4w89qolnsqRTO9pGl45ogNwdWcjCWczF
rDebRnfbwdvAp6GAZ4ElpIdbiCFjjOhzAuDyAUJFeyh/1kO8epqdXdstyfaMcrSegtO+FboDXsEh
izCgKpEuEmq8ZUwu040IdVOPSwIwcoQgTb63GG6U5TZSmDpaAYVLeIw2lshlHKFjSawux1VK3/Sg
jYxL7ToRSOlnmYYUnse+I3Z0QxrBSpEQYItH++ZNIYmPDw6dOV8rdrXFBLmQl4l5/pzozhaMO4Dk
7o3EODlH8jnSBzbcLqKQ70XbGQtAcT/Lr0hcKBNOBKHcS6Cl7ahPrrIIVAHnhYA0FzJSfax7GUgS
YYAJLVzMoDXPB8Ocka7CadD6gOoia+0BHAOWAskUpDCOsaR960NlmzhkEM1qoI52MkQiqCpVzG2Z
8i76JHCbq28NGmXeQTSGWwtkGWLJFR2SowcgOvpFrKkjAabTTagQWcm4FWYQ351ljYCpnYdtEtd1
fqRxhBc4KrsirtBjyqzdbTuEZ7dMlnrIFEc56lTt1Y3DJjUzMzSpLR73wRVxibxTZRSdErSUYb1I
olNtjPxhc66euJ05NU56aatSyxsDXK3L2NkusvxYMzQD9RgDO+nHbzefXnOJkKGcO4dKGHzryrDF
PUlBW2WBSV4OtzOTdV1wix1cBxXHjZItvquhgTJg7WF5S/Fy2XZjHpmV+jFReXhcvaeo5i7C7CJD
qGWEy4Uf4u5IpwoSB0/Z6EA=


--===============1769243599==--