diff options
| -rwxr-xr-x | run_unittests.py | 3 | ||||
| -rw-r--r-- | test cases/common/159 reserved targets/PHONY/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/159 reserved targets/meson.build | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/run_unittests.py b/run_unittests.py index b889c3d..666777d 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1288,6 +1288,9 @@ int main(int argc, char **argv) { targets = mesonbuild.coredata.forbidden_target_names # We don't actually define a target with this name targets.pop('build.ninja') + # Remove this to avoid multiple entries with the same name + # but different case. + targets.pop('PHONY') for i in targets: self.assertPathExists(os.path.join(testdir, i)) diff --git a/test cases/common/159 reserved targets/PHONY/meson.build b/test cases/common/159 reserved targets/PHONY/meson.build deleted file mode 100644 index d25583c..0000000 --- a/test cases/common/159 reserved targets/PHONY/meson.build +++ /dev/null @@ -1 +0,0 @@ -executable('test-PHONY', '../test.c') diff --git a/test cases/common/159 reserved targets/meson.build b/test cases/common/159 reserved targets/meson.build index 5123600..26572c0 100644 --- a/test cases/common/159 reserved targets/meson.build +++ b/test cases/common/159 reserved targets/meson.build @@ -15,11 +15,10 @@ subdir('coverage-xml') subdir('dist') subdir('distcheck') subdir('install') -# We end up creating duplicate lowercase target names for this on -# case-insensitive HFS+, so disable it -# https://travis-ci.org/mesonbuild/meson/jobs/264468097 -#subdir('phony') -subdir('PHONY') +# We don't have a 'PHONY' directory because Windows and OSX +# choke horribly when there are two entries with the same +# name but different case. +subdir('phony') subdir('reconfigure') subdir('scan-build') subdir('test') |