[llvm] r272052 - [lit] Fix an uninitialized var on Windows.

[Daniel Dunbar via llvm-commits]

Should be fixed in r272147.

Sorry for all the churn, I guess it was naive of me to expect I could land
this without testing Windows directly.

 - Daniel

On Tue, Jun 7, 2016 at 9:59 PM, Yaron Keren <yaron.keren at gmail.com> wrote:

> See the bots here:
>
>
> http://bb.pgr.jp/builders/ninja-clang-i686-msc19-R/builds/3811/steps/test-llvm
>
>
> 2016-06-08 7:57 GMT+03:00 Yaron Keren <yaron.keren at gmail.com>:
>
>> Now it errors on "AttributeError: 'str' object has no attribute 'decode'"
>> in the same location.
>>
>>
>> 2016-06-08 1:14 GMT+03:00 Daniel Dunbar via llvm-commits <
>> llvm-commits at lists.llvm.org>:
>>
>>> Fixed in r272066.
>>>
>>> On Tue, Jun 7, 2016 at 3:06 PM, Michael Spencer <bigcheesegs at gmail.com>
>>> wrote:
>>>
>>>> On Tue, Jun 7, 2016 at 1:14 PM, Daniel Dunbar via llvm-commits
>>>> <llvm-commits at lists.llvm.org> wrote:
>>>> > Author: ddunbar
>>>> > Date: Tue Jun  7 15:14:17 2016
>>>> > New Revision: 272052
>>>> >
>>>> > URL: http://llvm.org/viewvc/llvm-project?rev=272052&view=rev
>>>> > Log:
>>>> > [lit] Fix an uninitialized var on Windows.
>>>> >
>>>> > Modified:
>>>> >     llvm/trunk/utils/lit/lit/TestRunner.py
>>>> >
>>>> > Modified: llvm/trunk/utils/lit/lit/TestRunner.py
>>>> > URL:
>>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=272052&r1=272051&r2=272052&view=diff
>>>> >
>>>> ==============================================================================
>>>> > --- llvm/trunk/utils/lit/lit/TestRunner.py (original)
>>>> > +++ llvm/trunk/utils/lit/lit/TestRunner.py Tue Jun  7 15:14:17 2016
>>>> > @@ -255,6 +255,7 @@ def _executeShCmd(cmd, shenv, results, t
>>>> >                  result = subprocess.PIPE
>>>> >              else:
>>>> >                  if r[2] is None:
>>>> > +                    redir_filename = None
>>>> >                      if kAvoidDevNull and r[0] == '/dev/null':
>>>> >                          r[2] = tempfile.TemporaryFile(mode=r[1])
>>>> >                      elif kIsWindows and r[0] == '/dev/tty':
>>>> > @@ -398,7 +399,7 @@ def _executeShCmd(cmd, shenv, results, t
>>>> >          # Gather the redirected output files.
>>>> >          output_files = []
>>>> >          for (name, mode, f, path) in sorted(opened_files):
>>>> > -            if mode in ('w', 'a'):
>>>> > +            if path is not None and mode in ('w', 'a'):
>>>> >                  try:
>>>> >                      with open(path) as f:
>>>> >                          data = f.read()
>>>> >
>>>> >
>>>> > _______________________________________________
>>>> > llvm-commits mailing list
>>>> > llvm-commits at lists.llvm.org
>>>> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>>
>>>> Now getting:
>>>>
>>>> ******************** TEST 'LLVM :: Linker/2009-09-03-mdnode.ll' FAILED
>>>> ********************
>>>> Exception during script execution:
>>>> Traceback (most recent call last):
>>>>   File "C:\llvm\utils\lit\lit\run.py", line 168, in execute_test
>>>>     result = test.config.test_format.execute(test, self.lit_config)
>>>>   File "C:\llvm\utils\lit\lit\formats\shtest.py", line 12, in execute
>>>>     self.execute_external)
>>>>   File "C:\llvm\utils\lit\lit\TestRunner.py", line 832, in executeShTest
>>>>     res = _runShTest(test, litConfig, useExternalSh, script, tmpBase)
>>>>   File "C:\llvm\utils\lit\lit\TestRunner.py", line 780, in _runShTest
>>>>     res = executeScriptInternal(test, litConfig, tmpBase, script,
>>>> execdir)
>>>>   File "C:\llvm\utils\lit\lit\TestRunner.py", line 479, in
>>>> executeScriptInternal
>>>>     data = to_string(data.decode('utf-8'))
>>>>   File "C:\Python27\lib\encodings\utf_8.py", line 16, in decode
>>>>     return codecs.utf_8_decode(input, errors, True)
>>>> UnicodeDecodeError: 'utf8' codec can't decode byte 0xc0 in position 2:
>>>> invalid start byte
>>>>
>>>> - Michael Spencer
>>>>
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>
>>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160608/60a08012/attachment.html>