Revert "[llvm-lit] Process ANSI color codes in test output when formatting"

[hnrklssn]

Reverts #106776 because of a test failure on Windows.

[llvmbot]

@llvm/pr-subscribers-testing-tools

Author: Henrik G. Olsson (hnrklssn)

Changes

Reverts llvm/llvm-project#106776 because of a test failure on Windows.

---

Full diff: https://github.com/llvm/llvm-project/pull/108104.diff

5 Files Affected:

• (modified) llvm/utils/lit/lit/TestRunner.py (+2-26)
• (removed) llvm/utils/lit/tests/Inputs/escape-color/color-escaped.txt (-10)
• (removed) llvm/utils/lit/tests/Inputs/escape-color/color.txt (-6)
• (removed) llvm/utils/lit/tests/Inputs/escape-color/lit.cfg (-8)
• (removed) llvm/utils/lit/tests/escape-color.py (-4)

diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py
index a2c76d41a43e07..19f35fc7e212f3 100644
--- a/llvm/utils/lit/lit/TestRunner.py
+++ b/llvm/utils/lit/lit/TestRunner.py
@@ -1017,20 +1017,6 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper):
     return exitCode
 
 
-def findColor(line, curr_color):
-    start = line.rfind("\33[")
-    if start == -1:
-        return curr_color
-    end = line.find("m", start+2)
-    if end == -1:
-        return curr_color
-    match = line[start:end+1]
-    # "\33[0m" means "reset all formatting". Sometimes the 0 is skipped.
-    if match == "\33[m" or match == "\33[0m":
-        return None
-    return match
-
-
 def formatOutput(title, data, limit=None):
     if not data.strip():
         return ""
@@ -1041,18 +1027,8 @@ def formatOutput(title, data, limit=None):
         msg = ""
     ndashes = 30
     # fmt: off
-    out = f"# .---{title}{'-' * (ndashes - 4 - len(title))}\n"
-    curr_color = None
-    for line in data.splitlines():
-        if curr_color:
-            out += "\33[0m"
-        out += "# | "
-        if curr_color:
-            out += curr_color
-        out += line + "\n"
-        curr_color = findColor(line, curr_color)
-    if curr_color:
-        out += "\33[0m"  # prevent unterminated formatting from leaking
+    out =  f"# .---{title}{'-' * (ndashes - 4 - len(title))}\n"
+    out += f"# | " + "\n# | ".join(data.splitlines()) + "\n"
     out += f"# `---{msg}{'-' * (ndashes - 4 - len(msg))}\n"
     # fmt: on
     return out
diff --git a/llvm/utils/lit/tests/Inputs/escape-color/color-escaped.txt b/llvm/utils/lit/tests/Inputs/escape-color/color-escaped.txt
deleted file mode 100644
index e7a33e380b351c..00000000000000
--- a/llvm/utils/lit/tests/Inputs/escape-color/color-escaped.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# .---command stdout------------
-# | # RUN: cat %s
-# | �[31mred
-�[0m# | �[31mstill red�(B�[m
-# | plain
-# | �[32mgreen
-�[0m# | �[32mstill green (never terminated)
-�[0m# `-----------------------------
-
---
diff --git a/llvm/utils/lit/tests/Inputs/escape-color/color.txt b/llvm/utils/lit/tests/Inputs/escape-color/color.txt
deleted file mode 100644
index 15ffc22d134f0f..00000000000000
--- a/llvm/utils/lit/tests/Inputs/escape-color/color.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# RUN: cat %s
-�[31mred
-still red�(B�[m
-plain
-�[32mgreen
-still green (never terminated)
diff --git a/llvm/utils/lit/tests/Inputs/escape-color/lit.cfg b/llvm/utils/lit/tests/Inputs/escape-color/lit.cfg
deleted file mode 100644
index 36f4eb69d4858e..00000000000000
--- a/llvm/utils/lit/tests/Inputs/escape-color/lit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-import lit.formats
-
-config.name = "escape-color"
-config.suffixes = [".txt"]
-config.test_format = lit.formats.ShTest()
-config.test_source_root = None
-config.test_exec_root = None
-
diff --git a/llvm/utils/lit/tests/escape-color.py b/llvm/utils/lit/tests/escape-color.py
deleted file mode 100644
index 1d0b93b004e9da..00000000000000
--- a/llvm/utils/lit/tests/escape-color.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# cut off the first 9 lines to avoid absolute file paths in the output
-# then keep only the next 10 lines to avoid test timing in the output
-# RUN: %{lit} %{inputs}/escape-color/color.txt -a | tail -n +10 | head -n 10 > %t
-# RUN: diff %{inputs}/escape-color/color-escaped.txt %t