diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-04-18 16:09:06 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-04-18 16:09:06 +0000 |
| commit | 7642acca6d20d8c537a7aafe05cefaa8b213d953 (patch) | |
| tree | edddd2f882ff7835305b5cc1c28df5a0c1398b4c | |
| parent | 77c650f48b1035e0515840123309756b95797517 (diff) | |
| parent | f1737ca1b7158d44b117853135c740544f8a2394 (diff) | |
| download | dbus-7642acca6d20d8c537a7aafe05cefaa8b213d953.tar.gz dbus-7642acca6d20d8c537a7aafe05cefaa8b213d953.tar.bz2 dbus-7642acca6d20d8c537a7aafe05cefaa8b213d953.zip | |
Merge branch 'cherry-pick-14f46d14' into 'dbus-1.12'
build: Don't assume we can set permissions on a directory
See merge request dbus/dbus!112
| -rw-r--r-- | test/Makefile.am | 5 |
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 |