Reverted rL318911 since it broke the sanitizer-windows.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318914 91177308-0d34-0410-b5e6-96231b3b80d8

18 files changed, 2 insertions, 273 deletions

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)