[Git][ghc/ghc][wip/angerman/cross-test-suite] Maybe the test-wrapper logic should become a cmd_prefix?

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/cross-test-suite at Glasgow Haskell Compiler / GHC


Commits:
8ca1568f by Moritz Angermann at 2020-07-16T12:57:39+00:00
 Maybe the test-wrapper logic should become a cmd_prefix?

- - - - -


1 changed file:

- testsuite/driver/testlib.py


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -1652,16 +1652,20 @@ def simple_run(name: TestName, way: WayName, prog: str, extra_run_opts: str) ->
 
     if opts.cmd_prefix is not None:
         cmd = opts.cmd_prefix(cmd)
-
-    # 3. prefix with TEST_WRAPPER
-    # The test wrapper. Default to $TOP / driver / id
-    # for the identity test-wrapper.
-    if config.test_wrapper is None:
-        test_wrapper = Path(config.top) / "driver" / "id"
     else:
-        test_wrapper = config.test_wrapper
+        # (optional) 3. prefix with TEST_WRAPPER
+        #
+        # The test wrapper. Default to $TOP / driver / id
+        # for the identity test-wrapper.
+        #
+        # We won't do this if command prefix is set, as the
+        # set prefix and the test-wrapper might interfere.
+        if config.test_wrapper is None:
+            test_wrapper = Path(config.top) / "driver" / "id"
+        else:
+            test_wrapper = config.test_wrapper
 
-    cmd = 'TEST_WRAPPER="{test_wrapper}" && {cmd}'.format(**locals())
+        cmd = 'TEST_WRAPPER="{test_wrapper}" && {cmd}'.format(**locals())
 
     # 4. Apply cmd_wrapper if set.
     if opts.cmd_wrapper is not None:



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8ca1568f27e646248687e78c7b6559910877027f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8ca1568f27e646248687e78c7b6559910877027f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200716/ee3106fb/attachment-0001.html>