aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-05-13 11:32:28 -0700
committerGitHub <noreply@github.com>2020-05-13 11:32:28 -0700
commit85708facaea88f0909e3e58eb42738eb11729b88 (patch)
tree8b5a2942f8b84bdd402486aec2883e7832010c1b /tools
parentd526af89ca0e52fa076a805e4f585d16dbd1562a (diff)
parent1dee6c618d879c20bf0a70eebc54bc8caf47716f (diff)
downloadmeson-85708facaea88f0909e3e58eb42738eb11729b88.zip
meson-85708facaea88f0909e3e58eb42738eb11729b88.tar.gz
meson-85708facaea88f0909e3e58eb42738eb11729b88.tar.bz2
Merge pull request #6620 from jon-turney/test-output-check
Add a mechanism for validating meson output in tests
Diffstat (limited to 'tools')
-rwxr-xr-xtools/dircondenser.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/dircondenser.py b/tools/dircondenser.py
index 023c14e..0e28bec 100755
--- a/tools/dircondenser.py
+++ b/tools/dircondenser.py
@@ -74,6 +74,10 @@ def condense(dirname: str):
#print('git mv "%s" "%s"' % (old_name, new_name))
subprocess.check_call(['git', 'mv', old_name, new_name])
replacements.append((old_name, new_name))
+ # update any appearances of old_name in expected stdout in test.json
+ json = os.path.join(new_name, 'test.json')
+ if os.path.isfile(json):
+ replace_source(json, [(old_name, new_name)])
os.chdir(curdir)
replace_source('run_unittests.py', replacements)
replace_source('run_project_tests.py', replacements)