Revert "validate:launcher: Cache the result of meson introspect"

This reverts commit 05ce6d3b92.

We can't do that as it breaks meson logic to set envvars
This commit is contained in:
Thibault Saunier 2019-02-10 01:23:50 -03:00
parent 5a6307f913
commit 3d3264b342

View file

@ -106,21 +106,10 @@ class MesonTestsManager(TestsManager):
mesontests = []
for i, bdir in enumerate(self.options.meson_build_dirs):
bdir = os.path.abspath(bdir)
ninja_build = os.path.join(bdir, "build.ninja")
dumpfile = os.path.join(self.options.privatedir,
ninja_build.replace(os.path.sep, '_') + '_' + str(os.stat(ninja_build).st_mtime) + '.json')
try:
with open(dumpfile, 'r') as f:
tests_json = json.load(f)
except FileNotFoundError:
output = subprocess.check_output(
[meson, 'introspect', '--tests', bdir])
json_str = output.decode()
with open(dumpfile, 'w') as f:
f.write(json_str)
tests_json = json.loads(json_str)
output = subprocess.check_output(
[meson, 'introspect', '--tests', bdir])
for test_dict in tests_json:
for test_dict in json.loads(output.decode()):
mesontests.append(test_dict)
return mesontests