mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
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:
parent
5a6307f913
commit
3d3264b342
1 changed files with 3 additions and 14 deletions
|
@ -106,21 +106,10 @@ class MesonTestsManager(TestsManager):
|
||||||
mesontests = []
|
mesontests = []
|
||||||
for i, bdir in enumerate(self.options.meson_build_dirs):
|
for i, bdir in enumerate(self.options.meson_build_dirs):
|
||||||
bdir = os.path.abspath(bdir)
|
bdir = os.path.abspath(bdir)
|
||||||
ninja_build = os.path.join(bdir, "build.ninja")
|
output = subprocess.check_output(
|
||||||
dumpfile = os.path.join(self.options.privatedir,
|
[meson, 'introspect', '--tests', bdir])
|
||||||
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)
|
|
||||||
|
|
||||||
for test_dict in tests_json:
|
for test_dict in json.loads(output.decode()):
|
||||||
mesontests.append(test_dict)
|
mesontests.append(test_dict)
|
||||||
|
|
||||||
return mesontests
|
return mesontests
|
||||||
|
|
Loading…
Reference in a new issue