aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-08-19 23:07:45 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-20 18:10:34 +0300
commite02f1dc809c7835a3935c8ac4a457d93f4b358d6 (patch)
treea5caf97d200adfc8116a012646af46dac9084917
parentece243d9abe101536d509c814557ae8e09ed9d60 (diff)
downloadmeson-e02f1dc809c7835a3935c8ac4a457d93f4b358d6.zip
meson-e02f1dc809c7835a3935c8ac4a457d93f4b358d6.tar.gz
meson-e02f1dc809c7835a3935c8ac4a457d93f4b358d6.tar.bz2
Remove PHONY because Windows and OSX file systems are crap. Closes #2199.
-rwxr-xr-xrun_unittests.py3
-rw-r--r--test cases/common/159 reserved targets/PHONY/meson.build1
-rw-r--r--test cases/common/159 reserved targets/meson.build9
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')