www

commit 81a037caa53de86c860f92fa236f6da7a999d6e6
parent aae809550c33e7d401254ff344b62895f3d71105
Author: Georges Dupéron <georges.duperon@gmail.com>
Date:   Sun, 15 Jul 2018 23:18:57 +0200

imagemagick is missing x11 support

Diffstat:
M
.travis.yml
 | 
30
+++++++++++++++---------------
M
Makefile
 | 
2
+-

2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -103,21 +103,21 @@ matrix:
       # TODO: test in SH mode
 
 before_install:
-  - brew install cdrtools    || true
-  - brew install mtools      || true
-  - brew cask install gdisk  || true
-  - brew install imagemagick || true
-  - make --version           || true
-  - nasm -v                  || true
-  - mtools --version         || true
-  - mtools                   || true
-  - mkisofs --version        || true
-  - zip --help               || true
-  - unzip --version          || true
-  - gdisk --version          || true
-  - fdisk --version          || true
-  - import --version         || true
-  - Xvfb -h                  || true
+  - brew install cdrtools               || true
+  - brew install mtools                 || true
+  - brew cask install gdisk             || true
+  - brew install imagemagick --with-x11 || true
+  - make --version                      || true
+  - nasm -v                             || true
+  - mtools --version                    || true
+  - mtools                              || true
+  - mkisofs --version                   || true
+  - zip --help                          || true
+  - unzip --version                     || true
+  - gdisk --version                     || true
+  - fdisk --version                     || true
+  - import --version                    || true
+  - Xvfb -h                             || true
   - ./utils/install-sikulix.sh
   - export PATH="$HOME/sikulix/:$PATH"
   - if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi
diff --git a/Makefile b/Makefile
@@ -393,7 +393,7 @@ build/test_pass/sudo_iso_mount: ${os_filename} build/check_makefile | build/mnt_
 .PHONY: test/macos
 test/macos: build/check_makefile | deploy-screenshots
 	sudo mkdir /tmp/.X11-unix
-	sudo chmod 1777 /tmp/.X11-unix
+	sudo chmod a+rwxt /tmp/.X11-unix
 	xvfb :42 & \
 	sleep 10; \
 	DISPLAY=:42 xterm -e 'sh -c "echo hello; sleep 30"' & \