From 6dac9134f93b1e146153986cd030d3e808437afd Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 26 Jul 2017 22:21:25 +0000 Subject: [PATCH] [lit] Fix shtest-shell and max-failures lit tests on Windows Rewrite the write-to-stderr.sh and write-to-stdout-and-stderr.sh shell scripts as python scripts and call python on them. Fixes PR33940 llvm-svn: 309200 --- llvm/utils/lit/tests/Inputs/shtest-shell/redirects.txt | 6 +++--- llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py | 3 +++ llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.sh | 3 --- .../lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py | 4 ++++ .../lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.sh | 4 ---- llvm/utils/lit/tests/max-failures.py | 3 --- llvm/utils/lit/tests/shtest-shell.py | 3 --- 7 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py delete mode 100755 llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.sh create mode 100644 llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py delete mode 100755 llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.sh diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/redirects.txt b/llvm/utils/lit/tests/Inputs/shtest-shell/redirects.txt index 6be88b6..2329955 100644 --- a/llvm/utils/lit/tests/Inputs/shtest-shell/redirects.txt +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/redirects.txt @@ -17,13 +17,13 @@ # Check stderr redirect (2> and 2>>). # # RUN: echo "not-present" > %t.stderr-write -# RUN: %S/write-to-stderr.sh 2> %t.stderr-write +# RUN: python %S/write-to-stderr.py 2> %t.stderr-write # RUN: FileCheck --check-prefix=STDERR-WRITE < %t.stderr-write %s # # STDERR-WRITE-NOT: not-present # STDERR-WRITE: a line on stderr # -# RUN: %S/write-to-stderr.sh 2>> %t.stderr-write +# RUN: python %S/write-to-stderr.py 2>> %t.stderr-write # RUN: FileCheck --check-prefix=STDERR-APPEND < %t.stderr-write %s # # STDERR-APPEND: a line on stderr @@ -33,7 +33,7 @@ # Check combined redirect (&>). # # RUN: echo "not-present" > %t.combined -# RUN: %S/write-to-stdout-and-stderr.sh &> %t.combined +# RUN: python %S/write-to-stdout-and-stderr.py &> %t.combined # RUN: FileCheck --check-prefix=COMBINED-WRITE < %t.combined %s # # COMBINED-WRITE-NOT: not-present diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py b/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py new file mode 100644 index 0000000..aff94cd --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python +import sys +sys.stderr.write("a line on stderr\n") diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.sh b/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.sh deleted file mode 100755 index ead3fd3..0000000 --- a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo "a line on stderr" 1>&2 diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py b/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py new file mode 100644 index 0000000..5c18498 --- /dev/null +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import sys +sys.stdout.write("a line on stdout\n") +sys.stderr.write("a line on stderr\n") diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.sh b/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.sh deleted file mode 100755 index f20de5d..0000000 --- a/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo "a line on stdout" -echo "a line on stderr" 1>&2 diff --git a/llvm/utils/lit/tests/max-failures.py b/llvm/utils/lit/tests/max-failures.py index 7a26b3c..5cc258d 100644 --- a/llvm/utils/lit/tests/max-failures.py +++ b/llvm/utils/lit/tests/max-failures.py @@ -1,8 +1,5 @@ # Check the behavior of --max-failures option. # -# PR33941 -# XFAIL: windows -# # RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out # RUN: not %{lit} --max-failures=1 -j 1 -v %{inputs}/shtest-shell >> %t.out # RUN: not %{lit} --max-failures=2 -j 1 -v %{inputs}/shtest-shell >> %t.out diff --git a/llvm/utils/lit/tests/shtest-shell.py b/llvm/utils/lit/tests/shtest-shell.py index 1a6d91e..18b80cd 100644 --- a/llvm/utils/lit/tests/shtest-shell.py +++ b/llvm/utils/lit/tests/shtest-shell.py @@ -1,8 +1,5 @@ # Check the internal shell handling component of the ShTest format. # -# PR33940 -# XFAIL: windows -# # RUN: not %{lit} -j 1 -v %{inputs}/shtest-shell > %t.out # RUN: FileCheck --input-file %t.out %s # -- 2.7.4