[Git][ghc/ghc][wip/junit-fixes] Hi

[Ben Gamari]

Ben Gamari pushed to branch wip/junit-fixes at Glasgow Haskell Compiler / GHC


Commits:
9fb357a8 by Ben Gamari at 2019-06-23T23:30:24Z
Hi

- - - - -


2 changed files:

- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py


Changes:

=====================================
testsuite/driver/testglobals.py
=====================================
@@ -169,7 +169,7 @@ class TestConfig:
         # Where to look up runtime stats produced by haddock, needed for
         # the haddock perf tests in testsuite/tests/perf/haddock/.
         # See Note [Haddock runtime stats files] at the bottom of this file.
-        self.stats_files_dir = '/please_set_stats_files_dir'
+        self.stats_files_dir = Path('/please_set_stats_files_dir')
 
         # Should we cleanup after test runs?
         self.cleanup = True
@@ -380,10 +380,6 @@ class TestOptions:
        # in temporary directory in /tmp? See Note [Running tests in /tmp].
        self.local = True
 
-       # The directory where the runtime statistics output from Haddock are
-       # found.
-       self.stats_files_dir = None
-
 # The default set of options
 global default_testopts
 default_testopts = TestOptions()


=====================================
testsuite/driver/testlib.py
=====================================
@@ -2157,7 +2157,7 @@ def in_srcdir(name: Union[Path, str], suffix: str='') -> Path:
     return getTestOpts().srcdir / add_suffix(name, suffix)
 
 def in_statsdir(name: Union[Path, str], suffix: str='') -> Path:
-    dir = getTestOpts().stats_files_dir
+    dir = config.stats_files_dir
     if dir is None:
         raise TypeError('stats_files_dir is not set')
     return dir / add_suffix(name, suffix)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/9fb357a8fda423c46ded72f1edccbbf6fb1ba02e

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/9fb357a8fda423c46ded72f1edccbbf6fb1ba02e
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/20190623/c63efe89/attachment-0001.html>