aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mtest.py
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2022-08-22 15:42:21 -0700
committerEli Schwartz <eschwartz93@gmail.com>2022-09-04 19:05:14 -0400
commit2096e394fcde72184252948a0d77e3a31c3f9b91 (patch)
tree721d59477dabc32651a93186506f73058d27a181 /mesonbuild/mtest.py
parentd682d3f837f5d23037d1edcf5edb91077a9b52c8 (diff)
downloadmeson-2096e394fcde72184252948a0d77e3a31c3f9b91.zip
meson-2096e394fcde72184252948a0d77e3a31c3f9b91.tar.gz
meson-2096e394fcde72184252948a0d77e3a31c3f9b91.tar.bz2
mtest: Move loading of test data into its own function
A subsequent commit will do a bit more during test data loading, making a dedicated function seem advisable. The diff looks a bit odd, using git show --diff-algorithm=patience will make it clearer.
Diffstat (limited to 'mesonbuild/mtest.py')
-rw-r--r--mesonbuild/mtest.py23
1 files changed, 13 insertions, 10 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py
index bb41239..23e506d 100644
--- a/mesonbuild/mtest.py
+++ b/mesonbuild/mtest.py
@@ -1523,6 +1523,19 @@ class TestHarness:
if namebase:
self.logfile_base += '-' + namebase.replace(' ', '_')
+ self.load_metadata()
+
+ ss = set()
+ for t in self.tests:
+ for s in t.suite:
+ ss.add(s)
+ self.suites = list(ss)
+
+ def get_console_logger(self) -> 'ConsoleLogger':
+ assert self.console_logger
+ return self.console_logger
+
+ def load_metadata(self) -> None:
startdir = os.getcwd()
try:
os.chdir(self.options.wd)
@@ -1536,16 +1549,6 @@ class TestHarness:
finally:
os.chdir(startdir)
- ss = set()
- for t in self.tests:
- for s in t.suite:
- ss.add(s)
- self.suites = list(ss)
-
- def get_console_logger(self) -> 'ConsoleLogger':
- assert self.console_logger
- return self.console_logger
-
def load_tests(self, file_name: str) -> T.List[TestSerialisation]:
datafile = Path('meson-private') / file_name
if not datafile.is_file():