aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2020-01-20 23:30:25 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2020-02-13 17:15:58 +0000
commiteb1a8ecf7c2b10048f4715fb641cb6283297dde8 (patch)
treef00da72c00bbcc38cf70fe4bc42c040eafd37e71
parentf20b99b8da363f93b4c8f6a59dd9b5c45e997ff8 (diff)
downloadmeson-eb1a8ecf7c2b10048f4715fb641cb6283297dde8.zip
meson-eb1a8ecf7c2b10048f4715fb641cb6283297dde8.tar.gz
meson-eb1a8ecf7c2b10048f4715fb641cb6283297dde8.tar.bz2
Remove unused no-installed-files test feature
Looking at 45c8557d, the idea behind this seems to be that a test could conditionally indicate that the list of installed files should not be validated by creating that file. It's no longer used anywhere. Also remove a lingering no-install-files file which isn't used since commit c693bd9b.
-rwxr-xr-xrun_project_tests.py6
-rw-r--r--test cases/common/56 install script/no-installed-files0
2 files changed, 1 insertions, 5 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index 2669872..65e1d0c 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -243,14 +243,10 @@ def validate_install(srcdir: str, installdir: Path, compiler, env) -> str:
# List of installed files
info_file = Path(srcdir) / 'installed_files.txt'
installdir = Path(installdir)
- # If this exists, the test does not install any other files
- noinst_file = Path('usr/no-installed-files')
expected = {} # type: T.Dict[Path, bool]
ret_msg = ''
# Generate list of expected files
- if (installdir / noinst_file).is_file():
- expected[noinst_file] = False
- elif info_file.is_file():
+ if info_file.is_file():
with info_file.open() as f:
for line in f:
line = platform_fix_name(line.strip(), compiler, env)
diff --git a/test cases/common/56 install script/no-installed-files b/test cases/common/56 install script/no-installed-files
deleted file mode 100644
index e69de29..0000000
--- a/test cases/common/56 install script/no-installed-files
+++ /dev/null