Bugzilla – Attachment 6063 Details for
Bug 7095
Merge Marker Test Issues Unclear Failure Messages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix
0001-Fixing-cut-and-paste-error-and-removing-the-use-of-d.patch (text/plain), 988 bytes, created by
Chris Nighswonger
on 2011-10-26 15:29:48 UTC
(
hide
)
Description:
Fix
Filename:
MIME Type:
Creator:
Chris Nighswonger
Created:
2011-10-26 15:29:48 UTC
Size:
988 bytes
patch
obsolete
>From a7881b0cf7be011e131e3620e58491e4de71e605 Mon Sep 17 00:00:00 2001 >From: Chris Nighswonger <chris.nighswonger@gmail.com> >Date: Wed, 26 Oct 2011 11:14:05 -0400 >Subject: [PATCH] Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness >Content-Type: text/plain; charset="utf-8" > >--- > t/00-merge-conflict-markers.t | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > >diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t >index 24743ae..da11a58 100644 >--- a/t/00-merge-conflict-markers.t >+++ b/t/00-merge-conflict-markers.t >@@ -49,8 +49,7 @@ find({ > } > close $fh; > if ($marker_found) { >- fail("$file has no merge conflict markers"); >- diag("marker found in line $line"); >+ fail("$file contains merge conflict markers in line $line"); > } else { > pass("$file has no merge conflict markers"); > } >-- >1.7.2.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7095
:
6063
|
6159