From 83c2048bab7327510c0178e4f50eb9ddb0570dea Mon Sep 17 00:00:00 2001 From: Ying Yi Date: Thu, 23 Nov 2017 13:23:21 +0000 Subject: [PATCH] Reverted rL318911 since it broke the sanitizer-windows. llvm-svn: 318914 --- utils/lit/lit/TestRunner.py | 164 ------------------ .../tests/Inputs/shtest-shell/check_path.py | 28 --- .../Inputs/shtest-shell/diff-error-0.txt | 3 - .../Inputs/shtest-shell/diff-error-1.txt | 3 - .../Inputs/shtest-shell/diff-error-2.txt | 3 - .../Inputs/shtest-shell/diff-error-3.txt | 3 - .../Inputs/shtest-shell/diff-error-4.txt | 5 - .../Inputs/shtest-shell/diff-error-5.txt | 3 - .../Inputs/shtest-shell/diff-error-6.txt | 3 - .../Inputs/shtest-shell/mkdir-error-0.txt | 3 - .../Inputs/shtest-shell/mkdir-error-1.txt | 3 - .../Inputs/shtest-shell/mkdir-error-2.txt | 3 - .../tests/Inputs/shtest-shell/rm-error-0.txt | 3 - .../tests/Inputs/shtest-shell/rm-error-1.txt | 3 - .../tests/Inputs/shtest-shell/rm-error-2.txt | 3 - .../tests/Inputs/shtest-shell/rm-error-3.txt | 4 - .../tests/Inputs/shtest-shell/valid-shell.txt | 83 --------- utils/lit/tests/max-failures.py | 2 +- utils/lit/tests/shtest-shell.py | 117 +------------ 19 files changed, 2 insertions(+), 437 deletions(-) delete mode 100644 utils/lit/tests/Inputs/shtest-shell/check_path.py delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-0.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-1.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-2.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-3.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-4.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-5.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/diff-error-6.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/mkdir-error-0.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/mkdir-error-1.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/mkdir-error-2.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/rm-error-0.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/rm-error-1.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/rm-error-2.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/rm-error-3.txt delete mode 100644 utils/lit/tests/Inputs/shtest-shell/valid-shell.txt diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index 1bf5f66f02e..4def05d8870 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -1,13 +1,7 @@ from __future__ import absolute_import -import difflib -import functools -import itertools -import getopt import os, signal, subprocess, sys import re -import stat import platform -import shutil import tempfile import threading @@ -308,143 +302,6 @@ def executeBuiltinEcho(cmd, shenv): return stdout.getvalue() return "" -def executeBuiltinMkdir(cmd, cmd_shenv): - """executeBuiltinMkdir - Create new directories.""" - args = expand_glob_expressions(cmd.args, cmd_shenv.cwd)[1:] - try: - opts, args = getopt.gnu_getopt(args, 'p') - except getopt.GetoptError as err: - raise InternalShellError(cmd, "Unsupported: 'mkdir': %s" % str(err)) - - parent = False - for o, a in opts: - if o == "-p": - parent = True - else: - assert False, "unhandled option" - - if len(args) == 0: - raise InternalShellError(cmd, "Error: 'mkdir' is missing an operand") - - for dir in args: - if not os.path.isabs(dir): - dir = os.path.realpath(os.path.join(cmd_shenv.cwd, dir)) - if parent: - lit.util.mkdir_p(dir) - else: - try: - os.mkdir(dir) - except OSError as e: - raise InternalShellError(cmd, "Error: 'mkdir' command failed") - -def executeBuiltinDiff(cmd, cmd_shenv): - """executeBuiltinDiff - Compare files line by line.""" - args = expand_glob_expressions(cmd.args, cmd_shenv.cwd)[1:] - try: - opts, args = getopt.gnu_getopt(args, "wbu", ["strip-trailing-cr"]) - except getopt.GetoptError as err: - raise InternalShellError(cmd, "Unsupported: 'diff': %s" % str(err)) - - filelines, filepaths = ([] for i in range(2)) - ignore_all_space = False - ignore_space_change = False - unified_diff = False - strip_trailing_cr = False - for o, a in opts: - if o == "-w": - ignore_all_space = True - elif o == "-b": - ignore_space_change = True - elif o == "-u": - unified_diff = True - elif o == "--strip-trailing-cr": - strip_trailing_cr = True - else: - assert False, "unhandled option" - - if len(args) != 2: - raise InternalShellError(cmd, "Error: missing or extra operand") - - different = False - try: - for file in args: - if not os.path.isabs(file): - file = os.path.realpath(os.path.join(cmd_shenv.cwd, file)) - filepaths.append(file) - with open(file, 'r') as f: - filelines.append(f.readlines()) - - def compose2(f, g): - return lambda x: f(g(x)) - - f = lambda x: x - if strip_trailing_cr: - f = compose2(lambda line: line.rstrip('\r'), f) - if ignore_all_space or ignore_space_change: - ignoreSpace = lambda line, separator: separator.join(line.split()) - ignoreAllSpaceOrSpaceChange = functools.partial(ignoreSpace, separator='' if ignore_all_space else ' ') - f = compose2(ignoreAllSpaceOrSpaceChange, f) - - for idx, lines in enumerate(filelines): - filelines[idx]= [f(line) for line in lines] - - func = difflib.unified_diff if unified_diff else difflib.context_diff - for diff in func(filelines[0], filelines[1], filepaths[0], filepaths[1]): - sys.stdout.write(diff) - different = True - except IOError as e: - raise InternalShellError(cmd, "Error: 'diff' command failed") - - if different: - raise InternalShellError(cmd, "Error: The contents " - "of fromfile and tofile are different") - -def executeBuiltinRm(cmd, cmd_shenv): - """executeBuiltinRm - Removes (deletes) files or directories.""" - args = expand_glob_expressions(cmd.args, cmd_shenv.cwd)[1:] - try: - opts, args = getopt.gnu_getopt(args, "frR", ["--recursive"]) - except getopt.GetoptError as err: - raise InternalShellError(cmd, "Unsupported: 'rm': %s" % str(err)) - - force = False - recursive = False - for o, a in opts: - if o == "-f": - force = True - elif o in ("-r", "-R", "--recursive"): - recursive = True - else: - assert False, "unhandled option" - - if len(args) == 0: - raise InternalShellError(cmd, "Error: 'rm' is missing an operand") - - def on_rm_error(func, path, exc_info): - # path contains the path of the file that couldn't be removed - # let's just assume that it's read-only and remove it. - os.chmod(path, stat.S_IMODE( os.stat(path).st_mode) | stat.S_IWRITE) - os.remove(path) - - for dir in args: - if not os.path.isabs(dir): - dir = os.path.realpath(os.path.join(cmd_shenv.cwd, dir)) - if force and not os.path.exists(dir): - continue - try: - if os.path.isdir(dir): - if not recursive: - raise InternalShellError(cmd, "Error: " - "%s is a directory" % dir) - shutil.rmtree(dir, onerror = on_rm_error if force else None) - else: - if force and not os.access(dir, os.W_OK): - os.chmod(dir, - stat.S_IMODE(os.stat(dir).st_mode) | stat.S_IWRITE) - os.remove(dir) - except OSError as e: - raise InternalShellError(cmd, "Error: 'rm' command failed") - def processRedirects(cmd, stdin_source, cmd_shenv, opened_files): """Return the standard fds for cmd after applying redirects @@ -603,27 +460,6 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper): updateEnv(shenv, cmd.commands[0]) return 0 - if cmd.commands[0].args[0] == 'mkdir': - if len(cmd.commands) != 1: - raise InternalShellError(cmd.commands[0], "Unsupported: 'mkdir' " - "cannot be part of a pipeline") - executeBuiltinMkdir(cmd.commands[0], shenv) - return 0 - - if cmd.commands[0].args[0] == 'diff': - if len(cmd.commands) != 1: - raise InternalShellError(cmd.commands[0], "Unsupported: 'diff' " - "cannot be part of a pipeline") - executeBuiltinDiff(cmd.commands[0], shenv) - return 0 - - if cmd.commands[0].args[0] == 'rm': - if len(cmd.commands) != 1: - raise InternalShellError(cmd.commands[0], "Unsupported: 'rm' " - "cannot be part of a pipeline") - executeBuiltinRm(cmd.commands[0], shenv) - return 0 - procs = [] default_stdin = subprocess.PIPE stderrTempFiles = [] diff --git a/utils/lit/tests/Inputs/shtest-shell/check_path.py b/utils/lit/tests/Inputs/shtest-shell/check_path.py deleted file mode 100644 index c1d279700de..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/check_path.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - - -def check_path(argv): - if len(argv) < 3: - print("Wrong number of args") - return 1 - - type = argv[1] - paths = argv[2:] - exit_code = 0 - - if type == 'dir': - for idx, dir in enumerate(paths): - print(os.path.isdir(dir)) - elif type == 'file': - for idx, file in enumerate(paths): - print(os.path.isfile(file)) - else: - print("Unrecognised type {}".format(type)) - exit_code = 1 - return exit_code - -if __name__ == '__main__': - sys.exit (check_path (sys.argv)) diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-0.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-0.txt deleted file mode 100644 index 81888cf8197..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-0.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported diff (cannot be part of a pipeline). -# -# RUN: diff diff-error-0.txt diff-error-0.txt | echo Output diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-1.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-1.txt deleted file mode 100644 index 9836e0ea9d4..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-1.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported diff (not support the -B option). -# -# RUN: diff -B temp1.txt temp2.txt diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-2.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-2.txt deleted file mode 100644 index 9c0da6aa6f6..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-2.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on an internal shell error (missing tofile) -# -# RUN: diff temp.txt diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-3.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-3.txt deleted file mode 100644 index 31128193c01..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-3.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on an internal shell error (unable to find compared files) -# -# RUN: diff temp.txt temp1.txt diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-4.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-4.txt deleted file mode 100644 index 84e17ec3a0c..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-4.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Check error on an internal shell error (file's contexts are different) -# -# RUN: echo "hello-first" > %t -# RUN: echo "hello-second" > %t1 -# RUN: diff %t %t1 diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-5.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-5.txt deleted file mode 100644 index 6d8d2e5c334..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-5.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on an internal shell error (missing operand) -# -# RUN: diff -u diff --git a/utils/lit/tests/Inputs/shtest-shell/diff-error-6.txt b/utils/lit/tests/Inputs/shtest-shell/diff-error-6.txt deleted file mode 100644 index cc13d13c647..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/diff-error-6.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on an internal shell error (extra operand) -# -# RUN: diff -u a.txt b.txt c.txt diff --git a/utils/lit/tests/Inputs/shtest-shell/mkdir-error-0.txt b/utils/lit/tests/Inputs/shtest-shell/mkdir-error-0.txt deleted file mode 100644 index c29d4211067..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/mkdir-error-0.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported mkdir (cannot be part of a pipeline). -# -# RUN: mkdir -p temp | rm -rf temp diff --git a/utils/lit/tests/Inputs/shtest-shell/mkdir-error-1.txt b/utils/lit/tests/Inputs/shtest-shell/mkdir-error-1.txt deleted file mode 100644 index 8931f3d54eb..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/mkdir-error-1.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported mkdir (only does not support -m option). -# -# RUN: mkdir -p -m 777 temp diff --git a/utils/lit/tests/Inputs/shtest-shell/mkdir-error-2.txt b/utils/lit/tests/Inputs/shtest-shell/mkdir-error-2.txt deleted file mode 100644 index 401dbecf14b..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/mkdir-error-2.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported mkdir (missing operand). -# -# RUN: mkdir -p diff --git a/utils/lit/tests/Inputs/shtest-shell/rm-error-0.txt b/utils/lit/tests/Inputs/shtest-shell/rm-error-0.txt deleted file mode 100644 index 52966a813c4..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/rm-error-0.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported rm. (cannot be part of a pipeline) -# -# RUN: rm -rf temp | echo "hello" diff --git a/utils/lit/tests/Inputs/shtest-shell/rm-error-1.txt b/utils/lit/tests/Inputs/shtest-shell/rm-error-1.txt deleted file mode 100644 index 5065ea74420..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/rm-error-1.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported rm (only does not support -v option). -# -# RUN: rm -f -v temp diff --git a/utils/lit/tests/Inputs/shtest-shell/rm-error-2.txt b/utils/lit/tests/Inputs/shtest-shell/rm-error-2.txt deleted file mode 100644 index d638a792d57..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/rm-error-2.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Check error on a unsupported rm (only supports -f option and in combination with -r). -# -# RUN: rm -r hello diff --git a/utils/lit/tests/Inputs/shtest-shell/rm-error-3.txt b/utils/lit/tests/Inputs/shtest-shell/rm-error-3.txt deleted file mode 100644 index 1bab79aad08..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/rm-error-3.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Check error on a unsupported rm (can't remove test since it is a directory). -# -# RUN: mkdir -p test -# RUN: rm -f test diff --git a/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt b/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt deleted file mode 100644 index 633098eab59..00000000000 --- a/utils/lit/tests/Inputs/shtest-shell/valid-shell.txt +++ /dev/null @@ -1,83 +0,0 @@ -# Check rm file operations. -# Check force remove commands success whether the file does or doesn't exist. -# -# RUN: rm -f %t.write -# RUN: "%{python}" %S/check_path.py file %t.write > %t.out -# RUN: FileCheck --check-prefix=REMOVE-FILE < %t.out %s -# RUN: echo "create a temp file" > %t.write -# RUN: "%{python}" %S/check_path.py file %t.write > %t.out -# RUN: FileCheck --check-prefix=FILE-EXIST < %t.out %s -# RUN: rm -f %t.write -# RUN: "%{python}" %S/check_path.py file %t.write > %t.out -# RUN: FileCheck --check-prefix=REMOVE-FILE < %t.out %s -# -# REMOVE-FILE: False -# FILE-EXIST: True -# -# Check mkdir and rm folder operations. -# Check force remove commands success whether the directory does or doesn't exist. -# -# Check the mkdir command with -p option. -# RUN: rm -f -r %T/test -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out -# RUN: FileCheck --check-prefix=REMOVE-PARENT-DIR < %t.out %s -# RUN: mkdir -p %T/test -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out -# RUN: FileCheck --check-prefix=MAKE-PARENT-DIR < %t.out %s -# RUN: rm -f -r %T/test -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out -# RUN: FileCheck --check-prefix=REMOVE-PARENT-DIR < %t.out %s -# -# MAKE-PARENT-DIR: True -# REMOVE-PARENT-DIR: False -# -# Check the mkdir command without -p option. -# -# RUN: rm -rf %T/test1 -# RUN: mkdir %T/test1 -# RUN: "%{python}" %S/check_path.py dir %T/test1 > %t.out -# RUN: FileCheck --check-prefix=MAKE-DIR < %t.out %s -# RUN: cd %T/test1 && mkdir foo -# RUN: "%{python}" %S/check_path.py dir %T/test1 > %t.out -# RUN: FileCheck --check-prefix=MAKE-DIR < %t.out %s -# RUN: cd %T && rm -rf %T/test1 -# RUN: "%{python}" %S/check_path.py dir %T/test1 > %t.out -# RUN: FileCheck --check-prefix=REMOVE-DIR < %t.out %s -# -# MAKE-DIR: True -# REMOVE-DIR: False -# -# Check creating and removing multiple folders and rm * operation. -# -# RUN: rm -rf %T/test -# RUN: mkdir -p %T/test/test1 %T/test/test2 -# RUN: "%{python}" %S/check_path.py dir %T/test %T/test/test1 %T/test/test2 > %t.out -# RUN: FileCheck --check-prefix=DIRS-EXIST < %t.out %s -# RUN: echo "create a temp file" > %T/test/temp.write -# RUN: echo "create a temp1 file" > %T/test/test1/temp1.write -# RUN: echo "create a temp2 file" > %T/test/test2/temp2.write -# RUN: "%{python}" %S/check_path.py file %T/test/temp.write %T/test/test1/temp1.write %T/test/test2/temp2.write> %t.out -# RUN: FileCheck --check-prefix=FILES-EXIST < %t.out %s -# RUN: rm -r -f %T/* -# RUN: "%{python}" %S/check_path.py dir %T/test > %t.out -# RUN: FileCheck --check-prefix=REMOVE-ALL < %t.out %s -# -# DIRS-EXIST: True -# DIRS-EXIST-NEXT: True -# DIRS-EXIST-NEXT: True -# FILES-EXIST: True -# FILES-EXIST-NEXT: True -# FILES-EXIST-NEXT: True -# REMOVE-ALL: False -# -# Check diff operations. -# -# RUN: echo "hello" > %t.stdout -# RUN: echo "hello" > %t1.stdout -# RUN: diff %t.stdout %t1.stdout -# RUN: diff -u %t.stdout %t1.stdout -# -# RUN: mkdir -p %T/dir1 %T/dir2 -# RUN: cd %T/dir1 && echo "hello" > temp1.txt -# RUN: cd %T/dir2 && echo "hello" > temp2.txt -# RUN: diff temp2.txt ../dir1/temp1.txt diff --git a/utils/lit/tests/max-failures.py b/utils/lit/tests/max-failures.py index c86d7b7fbdc..bc58e9a4e47 100644 --- a/utils/lit/tests/max-failures.py +++ b/utils/lit/tests/max-failures.py @@ -8,7 +8,7 @@ # # END. -# CHECK: Failing Tests (17) +# CHECK: Failing Tests (3) # CHECK: Failing Tests (1) # CHECK: Failing Tests (2) # CHECK: error: Setting --max-failures to 0 does not have any effect. diff --git a/utils/lit/tests/shtest-shell.py b/utils/lit/tests/shtest-shell.py index b13a98d691a..33b5ab669ea 100644 --- a/utils/lit/tests/shtest-shell.py +++ b/utils/lit/tests/shtest-shell.py @@ -10,63 +10,6 @@ # CHECK: -- Testing: - -# CHECK: FAIL: shtest-shell :: diff-error-0.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-0.txt' FAILED *** -# CHECK: $ "diff" "diff-error-0.txt" "diff-error-0.txt" -# CHECK: # command stderr: -# CHECK: Unsupported: 'diff' cannot be part of a pipeline -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-error-1.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-1.txt' FAILED *** -# CHECK: $ "diff" "-B" "temp1.txt" "temp2.txt" -# CHECK: # command stderr: -# CHECK: Unsupported: 'diff': option -B not recognized -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-error-2.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-2.txt' FAILED *** -# CHECK: $ "diff" "temp.txt" -# CHECK: # command stderr: -# CHECK: Error: missing or extra operand -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-error-3.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-3.txt' FAILED *** -# CHECK: $ "diff" "temp.txt" "temp1.txt" -# CHECK: # command stderr: -# CHECK: Error: 'diff' command failed -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-error-4.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-4.txt' FAILED *** -# CHECK: $ "diff" -# CHECK: # command stderr: -# CHECK: Error: The contents of fromfile and tofile are different -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-error-5.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-5.txt' FAILED *** -# CHECK: $ "diff" -# CHECK: # command stderr: -# CHECK: Error: missing or extra operand -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: diff-error-6.txt -# CHECK: *** TEST 'shtest-shell :: diff-error-6.txt' FAILED *** -# CHECK: $ "diff" -# CHECK: # command stderr: -# CHECK: Error: missing or extra operand -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - # CHECK: FAIL: shtest-shell :: error-0.txt # CHECK: *** TEST 'shtest-shell :: error-0.txt' FAILED *** # CHECK: $ "not-a-real-command" @@ -87,65 +30,7 @@ # CHECK: Unsupported redirect: # CHECK: *** -# CHECK: FAIL: shtest-shell :: mkdir-error-0.txt -# CHECK: *** TEST 'shtest-shell :: mkdir-error-0.txt' FAILED *** -# CHECK: $ "mkdir" "-p" "temp" -# CHECK: # command stderr: -# CHECK: Unsupported: 'mkdir' cannot be part of a pipeline -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: mkdir-error-1.txt -# CHECK: *** TEST 'shtest-shell :: mkdir-error-1.txt' FAILED *** -# CHECK: $ "mkdir" "-p" "-m" "777" "temp" -# CHECK: # command stderr: -# CHECK: Unsupported: 'mkdir': option -m not recognized -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: mkdir-error-2.txt -# CHECK: *** TEST 'shtest-shell :: mkdir-error-2.txt' FAILED *** -# CHECK: $ "mkdir" "-p" -# CHECK: # command stderr: -# CHECK: Error: 'mkdir' is missing an operand -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - # CHECK: PASS: shtest-shell :: redirects.txt - -# CHECK: FAIL: shtest-shell :: rm-error-0.txt -# CHECK: *** TEST 'shtest-shell :: rm-error-0.txt' FAILED *** -# CHECK: $ "rm" "-rf" "temp" -# CHECK: # command stderr: -# CHECK: Unsupported: 'rm' cannot be part of a pipeline -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: rm-error-1.txt -# CHECK: *** TEST 'shtest-shell :: rm-error-1.txt' FAILED *** -# CHECK: $ "rm" "-f" "-v" "temp" -# CHECK: # command stderr: -# CHECK: Unsupported: 'rm': option -v not recognized -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: rm-error-2.txt -# CHECK: *** TEST 'shtest-shell :: rm-error-2.txt' FAILED *** -# CHECK: $ "rm" "-r" "hello" -# CHECK: # command stderr: -# CHECK: Error: 'rm' command failed -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - -# CHECK: FAIL: shtest-shell :: rm-error-3.txt -# CHECK: *** TEST 'shtest-shell :: rm-error-3.txt' FAILED *** -# CHECK: $ "rm" "-f" "test" -# CHECK: # command stderr: -# CHECK: test is a directory -# CHECK: error: command failed with exit status: 127 -# CHECK: *** - # CHECK: PASS: shtest-shell :: sequencing-0.txt # CHECK: XFAIL: shtest-shell :: sequencing-1.txt -# CHECK: PASS: shtest-shell :: valid-shell.txt -# CHECK: Failing Tests (17) +# CHECK: Failing Tests (3)