[llvm] r309399 - [lit] Fix shtest-format external_shell failures

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Fri Jul 28 09:13:02 2017
New Revision: 309399

URL: http://llvm.org/viewvc/llvm-project?rev=309399&view=rev
Log:
[lit] Fix shtest-format external_shell failures

When using win32 cmd.exe, turn off command echoing at the beginning of
the script (@echo off).

Replace a bash shell script with a python script for the
fail_with_bad_encoding test.

Added:
    llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
Removed:
    llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh
Modified:
    llvm/trunk/utils/lit/lit/TestRunner.py
    llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt

Modified: llvm/trunk/utils/lit/lit/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=309399&r1=309398&r2=309399&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py (original)
+++ llvm/trunk/utils/lit/lit/TestRunner.py Fri Jul 28 09:13:02 2017
@@ -711,6 +711,7 @@ def executeScript(test, litConfig, tmpBa
       mode += 'b'  # Avoid CRLFs when writing bash scripts.
     f = open(script, mode)
     if isWin32CMDEXE:
+        f.write('@echo off\n')
         f.write('\nif %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands))
     else:
         if test.config.pipefail:

Modified: llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt?rev=309399&r1=309398&r2=309399&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt (original)
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/fail_with_bad_encoding.txt Fri Jul 28 09:13:02 2017
@@ -1,5 +1,5 @@
 # Run a command that fails with error on stdout.
 #
-# RUN: %S/write-bad-encoding.sh
+# RUN: python %S/write-bad-encoding.py
 # RUN: false
 

Added: llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py?rev=309399&view=auto
==============================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py (added)
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py Fri Jul 28 09:13:02 2017
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import sys
+
+sys.stdout.write(b"a line with bad encoding: \xc2.")
+sys.stdout.flush()

Removed: llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh?rev=309398&view=auto
==============================================================================
--- llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh (original)
+++ llvm/trunk/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.sh (removed)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "a line with bad encoding: Â."