Revert "validate:launcher: Cache the result of meson introspect"
authorThibault Saunier <tsaunier@igalia.com>
Sun, 10 Feb 2019 04:23:50 +0000 (01:23 -0300)
committerThibault Saunier <tsaunier@igalia.com>
Sun, 10 Feb 2019 04:25:52 +0000 (01:25 -0300)
This reverts commit 05ce6d3b92e88341bd9743b021b33ce606c5d1bc.

We can't do that as it breaks meson logic to set envvars

validate/launcher/apps/gstcheck.py

index 2a87277..e5a4498 100644 (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)
-
-            for test_dict in tests_json:
+            output = subprocess.check_output(
+                [meson, 'introspect', '--tests', bdir])
+
+            for test_dict in json.loads(output.decode()):
                 mesontests.append(test_dict)
 
         return mesontests