<div dir="ltr">Hello Jordan,<br><br>This commit broke tests on few our builders:<br><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/5440">http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/5440</a><br><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast</a><br><br>. . .<br>Failing Tests (1):<br> lit :: shared-output.py<br><br>Please have a look?<br><br>Thanks<br><br>Galina<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Oct 13, 2017 at 9:12 AM, Jordan Rose via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jrose<br>
Date: Fri Oct 13 09:12:23 2017<br>
New Revision: 315697<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=315697&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=315697&view=rev</a><br>
Log:<br>
lit.py: Add new %{shared_output(LABEL)} substitution<br>
<br>
This refers to a temporary path that can be shared across all tests,<br>
identified by a particular label. This can be used for things like<br>
caches.<br>
<br>
At the moment, the character set for the LABEL is limited to C<br>
identifier characters, plus '-', '+', '=', and '.'. This is the same<br>
set of characters currently allowed in REQUIRES clause identifiers.<br>
<br>
Added:<br>
llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/<br>
llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/lit.cfg<br>
llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/primary.<wbr>txt<br>
llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/<wbr>secondary.txt<br>
llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/sub/<br>
llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/sub/sub.<wbr>txt<br>
llvm/trunk/utils/lit/tests/<wbr>shared-output.py<br>
Modified:<br>
llvm/trunk/docs/CommandGuide/<wbr>lit.rst<br>
llvm/trunk/docs/TestingGuide.<wbr>rst<br>
llvm/trunk/utils/lit/lit/<wbr>TestRunner.py<br>
llvm/trunk/utils/lit/lit/run.<wbr>py<br>
<br>
Modified: llvm/trunk/docs/CommandGuide/<wbr>lit.rst<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/lit.rst?rev=315697&r1=315696&r2=315697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/docs/<wbr>CommandGuide/lit.rst?rev=<wbr>315697&r1=315696&r2=315697&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/docs/CommandGuide/<wbr>lit.rst (original)<br>
+++ llvm/trunk/docs/CommandGuide/<wbr>lit.rst Fri Oct 13 09:12:23 2017<br>
@@ -395,17 +395,18 @@ PRE-DEFINED SUBSTITUTIONS<br>
:program:`lit` provides various patterns that can be used with the RUN command.<br>
These are defined in TestRunner.py. The base set of substitutions are:<br>
<br>
- ========== ==============<br>
- Macro Substitution<br>
- ========== ==============<br>
- %s source path (path to the file currently being run)<br>
- %S source dir (directory of the file currently being run)<br>
- %p same as %S<br>
- %{pathsep} path separator<br>
- %t temporary file name unique to the test<br>
- %T temporary directory unique to the test<br>
- %% %<br>
- ========== ==============<br>
+ ======================= ==============<br>
+ Macro Substitution<br>
+ ======================= ==============<br>
+ %s source path (path to the file currently being run)<br>
+ %S source dir (directory of the file currently being run)<br>
+ %p same as %S<br>
+ %{pathsep} path separator<br>
+ %t temporary file name unique to the test<br>
+ %T temporary directory unique to the test<br>
+ %{shared_output(LABEL)} temporary file name, identified by "LABEL", shared across all tests<br>
+ %% %<br>
+ ======================= ==============<br>
<br>
Other substitutions are provided that are variations on this base set and<br>
further substitution patterns can be defined by each test module. See the<br>
<br>
Modified: llvm/trunk/docs/TestingGuide.<wbr>rst<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/TestingGuide.rst?rev=315697&r1=315696&r2=315697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/docs/<wbr>TestingGuide.rst?rev=315697&<wbr>r1=315696&r2=315697&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/docs/TestingGuide.<wbr>rst (original)<br>
+++ llvm/trunk/docs/TestingGuide.<wbr>rst Fri Oct 13 09:12:23 2017<br>
@@ -464,6 +464,12 @@ RUN lines:<br>
<br>
Example: ``/home/user/llvm.build/test/<wbr>MC/ELF/Output``<br>
<br>
+``%{shared_output(LABEL)}``<br>
+ File path to a temporary file name shared across all tests, identified by<br>
+ LABEL. This is useful as a cache for generated resources.<br>
+<br>
+ Example: ``/home/user/llvm.build/test/<wbr>Output/Shared/LABEL.tmp``<br>
+<br>
``%{pathsep}``<br>
<br>
Expands to the path separator, i.e. ``:`` (or ``;`` on Windows).<br>
<br>
Modified: llvm/trunk/utils/lit/lit/<wbr>TestRunner.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=315697&r1=315696&r2=315697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>lit/TestRunner.py?rev=315697&<wbr>r1=315696&r2=315697&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/lit/<wbr>TestRunner.py (original)<br>
+++ llvm/trunk/utils/lit/lit/<wbr>TestRunner.py Fri Oct 13 09:12:23 2017<br>
@@ -829,6 +829,9 @@ def getDefaultSubstitutions(test, tmpDir<br>
sourcepath = test.getSourcePath()<br>
sourcedir = os.path.dirname(sourcepath)<br>
<br>
+ sharedOutputDir = os.path.join(test.suite.exec_<wbr>root, 'Output', 'Shared')<br>
+ sharedOutputDir += os.path.sep<br>
+<br>
# Normalize slashes, if requested.<br>
if normalize_slashes:<br>
sourcepath = sourcepath.replace('\\', '/')<br>
@@ -849,6 +852,8 @@ def getDefaultSubstitutions(test, tmpDir<br>
('%t', tmpName),<br>
('%basename_t', baseName),<br>
('%T', tmpDir),<br>
+ ('%{shared_output\(([-+=._a-<wbr>zA-Z0-9]+)\)}',<br>
+ '%s\\1.tmp' % (sharedOutputDir,)),<br>
('#_MARKER_#', '%')])<br>
<br>
# "%/[STpst]" should be normalized.<br>
<br>
Modified: llvm/trunk/utils/lit/lit/run.<wbr>py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/run.py?rev=315697&r1=315696&r2=315697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>lit/run.py?rev=315697&r1=<wbr>315696&r2=315697&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/lit/run.<wbr>py (original)<br>
+++ llvm/trunk/utils/lit/lit/run.<wbr>py Fri Oct 13 09:12:23 2017<br>
@@ -1,4 +1,5 @@<br>
import os<br>
+import shutil<br>
import sys<br>
import threading<br>
import time<br>
@@ -136,6 +137,13 @@ class Run(object):<br>
return True<br>
win32api.<wbr>SetConsoleCtrlHandler(console_<wbr>ctrl_handler, True)<br>
<br>
+ # Make fresh shared output directories.<br>
+ suites = set(test.suite for test in self.tests)<br>
+ for suite in suites:<br>
+ shared_dir = os.path.join(suite.exec_root, 'Output', 'Shared')<br>
+ shutil.rmtree(shared_dir, ignore_errors=True)<br>
+ lit.util.mkdir_p(shared_dir)<br>
+<br>
# Save the display object on the runner so that we can update it from<br>
# our task completion callback.<br>
self.display = display<br>
<br>
Added: llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/lit.cfg<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shared-output/lit.cfg?rev=315697&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/Inputs/shared-output/<wbr>lit.cfg?rev=315697&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/lit.cfg (added)<br>
+++ llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/lit.cfg Fri Oct 13 09:12:23 2017<br>
@@ -0,0 +1,5 @@<br>
+import lit.formats<br>
+<a href="http://config.name" rel="noreferrer" target="_blank">config.name</a> = 'shared-output'<br>
+config.suffixes = ['.txt']<br>
+config.test_format = lit.formats.ShTest()<br>
+config.test_source_root = os.path.dirname(os.path.<wbr>realpath(__file__))<br>
<br>
Added: llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/primary.<wbr>txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shared-output/primary.txt?rev=315697&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/Inputs/shared-output/<wbr>primary.txt?rev=315697&view=<wbr>auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/primary.<wbr>txt (added)<br>
+++ llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/primary.<wbr>txt Fri Oct 13 09:12:23 2017<br>
@@ -0,0 +1,2 @@<br>
+RUN: echo "primary" >> %{shared_output(SHARED)}<br>
+RUN: echo "other" >> %{shared_output(OTHER)}<br>
<br>
Added: llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/<wbr>secondary.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shared-output/secondary.txt?rev=315697&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/Inputs/shared-output/<wbr>secondary.txt?rev=315697&view=<wbr>auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/<wbr>secondary.txt (added)<br>
+++ llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/<wbr>secondary.txt Fri Oct 13 09:12:23 2017<br>
@@ -0,0 +1 @@<br>
+RUN: echo "secondary" >> %{shared_output(SHARED)}<br>
<br>
Added: llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/sub/sub.<wbr>txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/Inputs/shared-output/sub/sub.txt?rev=315697&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/Inputs/shared-output/<wbr>sub/sub.txt?rev=315697&view=<wbr>auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/sub/sub.<wbr>txt (added)<br>
+++ llvm/trunk/utils/lit/tests/<wbr>Inputs/shared-output/sub/sub.<wbr>txt Fri Oct 13 09:12:23 2017<br>
@@ -0,0 +1 @@<br>
+RUN: echo "sub" >> %{shared_output(SHARED)}<br>
<br>
Added: llvm/trunk/utils/lit/tests/<wbr>shared-output.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shared-output.py?rev=315697&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/shared-output.py?rev=<wbr>315697&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/tests/<wbr>shared-output.py (added)<br>
+++ llvm/trunk/utils/lit/tests/<wbr>shared-output.py Fri Oct 13 09:12:23 2017<br>
@@ -0,0 +1,13 @@<br>
+# RUN: rm -rf %t && mkdir -p %t<br>
+# RUN: echo 'lit_config.load_config(<wbr>config, "%{inputs}/shared-output/lit.<wbr>cfg")' > %t/lit.site.cfg<br>
+# RUN: %{lit} %t<br>
+# RUN: FileCheck %s < %t/Output/Shared/SHARED.tmp<br>
+# RUN: FileCheck -check-prefix=NEGATIVE %s < %t/Output/Shared/SHARED.tmp<br>
+# RUN: FileCheck -check-prefix=OTHER %s < %t/Output/Shared/OTHER.tmp<br>
+<br>
+# CHECK-DAG: primary<br>
+# CHECK-DAG: secondary<br>
+# CHECK-DAG: sub<br>
+<br>
+# NEGATIVE-NOT: other<br>
+# OTHER: other<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>