summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2019-04-18 15:35:22 +0000
committerSimon McVittie <smcv@collabora.com>2019-04-18 15:35:22 +0000
commit6ee63e3a70f15aa8d32c407faf99e927ab9ce56a (patch)
tree9867c34b81399d47b3153e492eda50ebf1d9be20
parentfd0c19d6d87419371280b5cd511ea41e45b7ece5 (diff)
parent14f46d14a0526f137f81a3fff5d32f26733323cd (diff)
downloaddbus-6ee63e3a70f15aa8d32c407faf99e927ab9ce56a.tar.gz
Merge branch 'msys2-chmod' into 'master'
build: Don't assume we can set permissions on a directory Closes #216 See merge request dbus/dbus!110
-rw-r--r--test/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 27d19460..559590b2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -706,8 +706,11 @@ EXTRA_DIST += $(static_data)
## copy tests to builddir so that generated tests and static tests
## are all in one place.
+## Note that we can't create the XDG_RUNTIME_DIR with permissions 0700
+## on MSYS2, which rejects attempts to change permissions, hence "|| true".
all-local: copy-config-local uninstalled-config-local
- $(AM_V_at)$(MKDIR_P) -m 700 XDG_RUNTIME_DIR
+ $(AM_V_at)$(MKDIR_P) XDG_RUNTIME_DIR
+ $(AM_V_at)chmod 0700 XDG_RUNTIME_DIR || true
copy-config-local:
$(AM_V_at)$(MKDIR_P) data/valid-config-files/session.d