summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2019-04-17 15:32:01 +0000
committerSimon McVittie <smcv@collabora.com>2019-04-18 15:38:38 +0000
commitf1737ca1b7158d44b117853135c740544f8a2394 (patch)
treeedddd2f882ff7835305b5cc1c28df5a0c1398b4c
parent77c650f48b1035e0515840123309756b95797517 (diff)
downloaddbus-cherry-pick-14f46d14.tar.gz
build: Don't assume we can set permissions on a directorycherry-pick-14f46d14
MSYS2 has enough of a Unixish environment to run Autotools, but apparently not enough of a Unixish environment to have functional permissions. Closes: dbus#216 (cherry picked from commit 14f46d14a0526f137f81a3fff5d32f26733323cd)
-rw-r--r--test/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 746ed314..3582932e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -554,8 +554,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