[Mesa-dev] [Bug 82327] FAIL: glcpp/tests/glcpp-test-cr-lf

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=82327

Vinson Lee <vlee at freedesktop.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #6 from Vinson Lee <vlee at freedesktop.org> ---
commit f90b7e0f2bee56af22edeebfea292ab960ce0628
Author: Carl Worth <cworth at cworth.org>
Date:   Mon Aug 18 16:26:34 2014 -0700

    glcpp: Fix glcpp-test-cr-lf "make check" test for Mac OS X

    There were two problems with the way this script used sed on OS X:

      1. The OS X sed doesn't interpret "\r" in a replacement list as a
         carriage-return character, (instead it was inserting a literal
         'r' character).

         We fix this by putting an actual ^M character into the source of
         the script, (rather than a two-character escape sequence hoping
         for sed to do the right thing).

      2. When generating the test files with LF-CR ("\n\r") newlines, the
         OS X sed was adding an undesired final newline ("\n") at the end
         of the file. We avoid this by first using sed to add the ^M
         before the newlines, then using tr to swap the \r and \n
         characters. This way, sed never sees any lines ending with
         anything but \n, so it doesn't get confused and doesn't add any
         bogus extra newlines.

    Tested-by: Vinson Lee <vlee at freedesktop.org>

    Vinson's testing confirmed that this patch fixes FreeBSD as well.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140902/e1743702/attachment.html>