From: Bjorn Munch
Date: January 11 2011 9:52am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2964) Bug#59002
List-Archive: http://lists.mysql.com/commits/128404
X-Bug: 59002
Message-Id: <201101110952.p0B9q4Yh012349@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1260605504=="

--===============1260605504==
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

 2964 Bjorn Munch	2011-01-11
      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-11 09:51:31 +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);


--===============1260605504==
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: d37970957a5fa77498c0d0f4bbfc72b1d1b808ef
# timestamp: 2011-01-11 10:52:04 +0100
# base_revision_id: bjorn.munch@stripped\
#   g0oi0h5umw5n7tkx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWd6b4MAAe5fgElQenf//1Ii
RAS////6UASM2rb105xwHOltBJImpiMmmnpNAZEymmam1GEyZNNAbUGSAARTypvKn6aJNtKABppo
A0DEGJGSKn4ap6phPUxPIJo9TaIwCY0CA5piYCNMCMIwAAABMIwEomkGRqj1NMm0Jo2oyNA0A0DQ
Aglz1bpskH3+nd9TTpxczZMbKJHv0OJi987eeQW9kes+98rPazvbO3HZJLolEHsqO1vCzX46O/JJ
A+WYZej2zYsil9EG5VMba296nlddlz5z6SVdzoZtU/HW7UpLfzf2gjGAu6LRok0Gu+O9zlRquDRN
T1hO+DyNMeF/DW3bMc4UyS0zJlTmTsQx36495xZrJyI4lbKZxFssgZctC3C8VvULxrnm9xkSIEjF
HLyeNnEIg0QxRW3EOHncQ1h5JB6cgYDaKTgMPUinK3ikT05Re7DQtynpLo4Rg4LbtooUEQFxhTkD
pF990AFwUDg8ScANQwXk7DMVeLApNj2A4n6j1WvkHfLLyXg2wFJ1vxqsmLyQLxhr4QSlIy0CjlzK
lv6OQqXdkfI19QcpClHiDTchLAmEVC/MBQPNEVCyjFDTXTwFZMfuSFkNmIGCWqm00YcjYYOF0iyW
PWykYI0lv2w6LjUq4i5HIP1s1F825QZ0DINvVndDHExfIKhmGMTnu9ALJP3ymhbUOryPgLOCSIwu
TGYaiUQF6XQXBaiIJTCTyBxfDJbPDbF6u+NZkV2oiE87ZB2KhOLAKUX64MGNfyJ9+lvlsYyYZeGr
jAzkiLkUNeYSsniEuRPpqiUaqwmeLDAtCMIbxmw3cBRzKFaIMQjkwSnCBf02JVNHkkhXS9WWa6Yi
adGd7x5Gk4/4S0MpkFds1OygR6SrBZysPYxEtwoQS22lByglzyeCISxQf6sah6UR289uW6TjlHFZ
LNOuE6sH+0FguLifQWDtBuOdteLXyqZb7ezrgNA4DID6W3Y34oHGW+0i6E4MLE1ZZxMry7Vs662f
eZtFUjbPVxVklUuM7Uy05M+Y165D2PzeTbb6b8QM1ZjByf44Ezy0uzO5demoq14C86Cs95TkzhdD
Dto5O5NVtcqv0Oc/qbAnEUY7GrTAt4twSE/lOL34zZyImWtTmWa4rg+xNLfNvI8NaEOkM6vgEoqo
Y0vTZbCGcKNHxBqdO+ESXH4WJHXqR5iYtz5tAdhFZOFwNUC5YCyRMkICO+6YZ4j5Rpfpy4O4m0RX
puQkOqYiZo8avYwP7CQ86jjGXdKjO0LDSQnWUGopfS5CREMiYQHAsbzYJMEUiikWDHUH+xwG1ood
J5HqAZQQDqi2yT7iRsAo+ABl1MM4DfyN/BEKLDH56NPuqFCFemEzLdbTAIUFkRERpJ5MYxxE9qh3
ChKqCZJlfWJQS6zJt+jHl7JPGfY3AYjCmWQ0KtwCobuL9rIvMxVMFhODu0oBnOox3dO22MHwHp7O
DyHJPYdjDY1sVQDFiErqhzOw0AWdkUHKMfuDmwUHXkOiA3rnQkUZlPAzkqYN3UTLNqetcd4x3dKw
qxzFBEjSs53ESzTSUeBgxkSwY/4u5IpwoSDO9N8G


--===============1260605504==--