Revert "lit.py: Add new %{shared_output(LABEL)} substitution"

This reverts r315697 and my ill-fated attempts to fix it on Windows.
I'll try again when I get access to a Windows machine.

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

7 files changed, 0 insertions, 38 deletions

diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
index 6680bd0312c..b874f9ee61b 100644
--- a/utils/lit/lit/TestRunner.py
+++ b/utils/lit/lit/TestRunner.py
@@ -829,9 +829,6 @@ def getDefaultSubstitutions(test, tmpDir, tmpBase, normalize_slashes=False):
     sourcepath = test.getSourcePath()
     sourcedir = os.path.dirname(sourcepath)
 
-    sharedOutputDir = os.path.join(test.suite.exec_root, 'Output', 'Shared')
-    sharedOutputDir += os.path.sep
-
     # Normalize slashes, if requested.
     if normalize_slashes:
         sourcepath = sourcepath.replace('\\', '/')
@@ -852,8 +849,6 @@ def getDefaultSubstitutions(test, tmpDir, tmpBase, normalize_slashes=False):
                           ('%t', tmpName),
                           ('%basename_t', baseName),
                           ('%T', tmpDir),
-                          ('%{shared_output\(([-+=._a-zA-Z0-9]+)\)}',
-                           '%s\\1.tmp' % (sharedOutputDir,)),
                           ('#_MARKER_#', '%')])
 
     # "%/[STpst]" should be normalized.
diff --git a/utils/lit/lit/run.py b/utils/lit/lit/run.py
index 92dfed97d75..a4a21234fa3 100644
--- a/utils/lit/lit/run.py
+++ b/utils/lit/lit/run.py
@@ -1,5 +1,4 @@
 import os
-import shutil
 import sys
 import threading
 import time
@@ -137,13 +136,6 @@ class Run(object):
                 return True
             win32api.SetConsoleCtrlHandler(console_ctrl_handler, True)
 
-        # Make fresh shared output directories.
-        suites = set(test.suite for test in self.tests)
-        for suite in suites:
-            shared_dir = os.path.join(suite.exec_root, 'Output', 'Shared')
-            shutil.rmtree(shared_dir, ignore_errors=True)
-            lit.util.mkdir_p(shared_dir)
-
         # Save the display object on the runner so that we can update it from
         # our task completion callback.
         self.display = display
diff --git a/utils/lit/tests/Inputs/shared-output/lit.cfg b/utils/lit/tests/Inputs/shared-output/lit.cfg
deleted file mode 100644
index 121bff7ec98..00000000000
--- a/utils/lit/tests/Inputs/shared-output/lit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-import lit.formats
-config.name = 'shared-output'
-config.suffixes = ['.txt']
-config.test_format = lit.formats.ShTest()
-config.test_source_root = os.path.dirname(os.path.realpath(__file__))
diff --git a/utils/lit/tests/Inputs/shared-output/primary.txt b/utils/lit/tests/Inputs/shared-output/primary.txt
deleted file mode 100644
index 7da1deeaea6..00000000000
--- a/utils/lit/tests/Inputs/shared-output/primary.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-RUN: echo "primary" >> %{shared_output(SHARED)}
-RUN: echo "other" >> %{shared_output(OTHER)}
diff --git a/utils/lit/tests/Inputs/shared-output/secondary.txt b/utils/lit/tests/Inputs/shared-output/secondary.txt
deleted file mode 100644
index c706a597eca..00000000000
--- a/utils/lit/tests/Inputs/shared-output/secondary.txt
+++ /dev/null
@@ -1 +0,0 @@
-RUN: echo "secondary" >> %{shared_output(SHARED)}
diff --git a/utils/lit/tests/Inputs/shared-output/sub/sub.txt b/utils/lit/tests/Inputs/shared-output/sub/sub.txt
deleted file mode 100644
index 4418b348723..00000000000
--- a/utils/lit/tests/Inputs/shared-output/sub/sub.txt
+++ /dev/null
@@ -1 +0,0 @@
-RUN: echo "sub" >> %{shared_output(SHARED)}
diff --git a/utils/lit/tests/shared-output.py b/utils/lit/tests/shared-output.py
deleted file mode 100644
index 616f85718da..00000000000
--- a/utils/lit/tests/shared-output.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# XFAIL: windows
-# Still need to work out some path issues
-
-# RUN: rm -rf %t && mkdir -p %t
-# RUN: echo 'lit_config.load_config(config, os.path.join(r"%{inputs}", "shared-output", "lit.cfg"))' > %t/lit.site.cfg
-# RUN: %{lit} %t
-# RUN: FileCheck %s < %t/Output/Shared/SHARED.tmp
-# RUN: FileCheck -check-prefix=NEGATIVE %s < %t/Output/Shared/SHARED.tmp
-# RUN: FileCheck -check-prefix=OTHER %s <  %t/Output/Shared/OTHER.tmp
-
-# CHECK-DAG: primary
-# CHECK-DAG: secondary
-# CHECK-DAG: sub
-
-# NEGATIVE-NOT: other
-# OTHER: other