From 7598a42e2abcfd72bb742017d185b03fa3bb9bfd Mon Sep 17 00:00:00 2001 From: Daniel Thornburgh Date: Mon, 27 Jun 2022 11:13:52 -0700 Subject: [PATCH] [Symbolize] Fix llvm-symbolizer --filter-markup test on Windows. The tests use in-band ANSI color codes, while the Windows cmd console uses an out-of-band interface for color. --- .../tools/llvm-symbolizer/filter-markup-color.test | 21 ++++++++++++++++++++ llvm/test/tools/llvm-symbolizer/filter-markup.test | 23 ++++------------------ 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 llvm/test/tools/llvm-symbolizer/filter-markup-color.test diff --git a/llvm/test/tools/llvm-symbolizer/filter-markup-color.test b/llvm/test/tools/llvm-symbolizer/filter-markup-color.test new file mode 100644 index 0000000..c960baf --- /dev/null +++ b/llvm/test/tools/llvm-symbolizer/filter-markup-color.test @@ -0,0 +1,21 @@ +UNSUPPORTED: system-windows + +RUN: echo -e "a{{{symbol:foo}}}b\n{{{symbol:bar}}}\n" > %t.input + +RUN: llvm-symbolizer --filter-markup --color < %t.input > %t.color +RUN: FileCheck %s --check-prefix=COLOR --input-file=%t.color --match-full-lines --implicit-check-not {{.}} + +RUN: llvm-symbolizer --filter-markup --color=auto < %t.input > %t.autocolor +RUN: FileCheck %s --check-prefix=NOCOLOR --input-file=%t.autocolor --match-full-lines --implicit-check-not {{.}} + +RUN: llvm-symbolizer --filter-markup --color=never < %t.input > %t.nevercolor +RUN: FileCheck %s --check-prefix=NOCOLOR --input-file=%t.nevercolor --match-full-lines --implicit-check-not {{.}} + +RUN: llvm-symbolizer --filter-markup --color=always < %t.input > %t.alwayscolor +RUN: FileCheck %s --check-prefix=COLOR --input-file=%t.alwayscolor --match-full-lines --implicit-check-not {{.}} + +NOCOLOR: afoob +NOCOLOR: bar + +COLOR: a{{.}}[0;34mfoo{{.}}[0mb +COLOR: {{.}}[0;34mbar{{.}}[0m diff --git a/llvm/test/tools/llvm-symbolizer/filter-markup.test b/llvm/test/tools/llvm-symbolizer/filter-markup.test index 4610994..be65adb 100644 --- a/llvm/test/tools/llvm-symbolizer/filter-markup.test +++ b/llvm/test/tools/llvm-symbolizer/filter-markup.test @@ -1,21 +1,6 @@ RUN: echo -e "a{{{symbol:foo}}}b\n{{{symbol:bar}}}\n" > %t.input -RUN: llvm-symbolizer --filter-markup < %t.input > %t.nocolor -RUN: FileCheck %s --check-prefix=NOCOLOR --input-file=%t.nocolor --match-full-lines --implicit-check-not {{.}} +RUN: llvm-symbolizer --filter-markup < %t.input > %t.output +RUN: FileCheck %s --input-file=%t.output --match-full-lines --implicit-check-not {{.}} -NOCOLOR: afoob -NOCOLOR: bar - -RUN: llvm-symbolizer --filter-markup --color < %t.input > %t.color -RUN: FileCheck %s --check-prefix=COLOR --input-file=%t.color --match-full-lines --implicit-check-not {{.}} - -RUN: llvm-symbolizer --filter-markup --color=auto < %t.input > %t.autocolor -RUN: FileCheck %s --check-prefix=NOCOLOR --input-file=%t.autocolor --match-full-lines --implicit-check-not {{.}} - -RUN: llvm-symbolizer --filter-markup --color=never < %t.input > %t.nevercolor -RUN: FileCheck %s --check-prefix=NOCOLOR --input-file=%t.nevercolor --match-full-lines --implicit-check-not {{.}} - -RUN: llvm-symbolizer --filter-markup --color=always < %t.input > %t.alwayscolor -RUN: FileCheck %s --check-prefix=COLOR --input-file=%t.alwayscolor --match-full-lines --implicit-check-not {{.}} - -COLOR: a{{.}}[0;34mfoo{{.}}[0mb -COLOR: {{.}}[0;34mbar{{.}}[0m +CHECK: afoob +CHECK: bar -- 2.7.4