[PATCH] D158221: [llvm-lit] copy CRT/STL DLLs into the output directory

[Nicole Mazzuca via Phabricator via llvm-commits]

strega-nil updated this revision to Diff 551651.
strega-nil added a comment.

Fix the code to work with built-in lit/main.py

The code in the first commit was designed to work with MSVC's internal
lit/msvc_main.py; the new code works with either.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D158221/new/

https://reviews.llvm.org/D158221

Files:
  llvm/utils/lit/lit/TestRunner.py
  llvm/utils/lit/lit/run.py


Index: llvm/utils/lit/lit/run.py
===================================================================
--- llvm/utils/lit/lit/run.py
+++ llvm/utils/lit/lit/run.py
@@ -1,5 +1,8 @@
+import itertools
 import multiprocessing
 import os
+import pathlib
+import shutil
 import time
 
 import lit.Test
@@ -55,6 +58,28 @@
         deadline = time.time() + timeout
 
         try:
+            # On Windows, copy the required DLLs from PATH into the test directory
+            # This avoids the loader finding DLLs in C:\Windows\System32
+            if self.lit_config.isWindows:
+                def outputPath(path):
+                    # this handles both the unit test C:\...\TestCases\Windows\foo.cpp,
+                    # and also the regular test C:\...\X86_64WindowsDynamicConfig\Asan-x86_64-inline-Dynamic-Test.exe\16\18
+                    path = pathlib.Path(path)
+                    parent = path.parent
+                    while path.suffix == '':
+                        path, parent = parent, parent.parent
+                        assert(path != path.parent)
+                    return parent / 'Output'
+                outputDirectories = {outputPath(test.getExecPath()) for test in self.tests}
+                toolsetDirectory = pathlib.Path(lit.util.which("cl.exe")).parent
+                for outputDirectory in outputDirectories:
+                    lit.util.mkdir_p(outputDirectory)
+                    for dllToCopy in itertools.chain(\
+                            toolsetDirectory.glob('msvcp*.dll'),\
+                            toolsetDirectory.glob('vcruntime*.dll'),\
+                            toolsetDirectory.glob('ucrtbase*.dll')):
+                        shutil.copyfile(dllToCopy, outputDirectory / dllToCopy.name)
+
             self._execute(deadline)
         finally:
             skipped = lit.Test.Result(lit.Test.SKIPPED)
Index: llvm/utils/lit/lit/TestRunner.py
===================================================================
--- llvm/utils/lit/lit/TestRunner.py
+++ llvm/utils/lit/lit/TestRunner.py
@@ -11,7 +11,6 @@
 import shutil
 import tempfile
 import threading
-from pathlib import Path
 
 import io
 
@@ -2067,18 +2066,7 @@
         return out, err, exitCode, timeoutInfo, status
 
     # Create the output directory if it does not already exist.
-    outputDir = os.path.dirname(tmpBase)
-    lit.util.mkdir_p(outputDir)
-
-    # On Windows, copy the required DLLs from PATH into the test directory
-    # This avoids the loader finding DLLs in C:\Windows\System32
-    if litConfig.isWindows:
-        toolsetDirectory = Path(lit.util.which("cl.exe")).parent
-        for dllToCopy in itertools.chain(\
-                toolsetDirectory.glob('msvcp*.dll'),\
-                toolsetDirectory.glob('vcruntime*.dll'),\
-                toolsetDirectory.glob('ucrtbase*.dll')):
-            shutil.copyfile(dllToCopy, os.path.join(outputDir, dllToCopy.name))
+    lit.util.mkdir_p(os.path.dirname(tmpBase))
 
     # Re-run failed tests up to test.allowed_retries times.
     execdir = os.path.dirname(test.getExecPath())


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D158221.551651.patch
Type: text/x-patch
Size: 3083 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230818/a69be077/attachment.bin>