suzanne.soy/os-test-framework
1
0
Fork 0
Code Issues 48 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

imagemagick is missing x11 support

Browse Source
This commit is contained in:
Georges Dupéron 2018-07-15 23:18:57 +02:00
parent aae809550c
commit 81a037caa5
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.travis.yml
View File

@ -103,21 +103,21 @@ matrix:
# TODO: test in SH mode # TODO: test in SH mode
before_install: before_install:
- brew install cdrtools || true - brew install cdrtools || true
- brew install mtools || true - brew install mtools || true
- brew cask install gdisk || true - brew cask install gdisk || true
- brew install imagemagick || true - brew install imagemagick --with-x11 || true
- make --version || true - make --version || true
- nasm -v || true - nasm -v || true
- mtools --version || true - mtools --version || true
- mtools || true - mtools || true
- mkisofs --version || true - mkisofs --version || true
- zip --help || true - zip --help || true
- unzip --version || true - unzip --version || true
- gdisk --version || true - gdisk --version || true
- fdisk --version || true - fdisk --version || true
- import --version || true - import --version || true
- Xvfb -h || true - Xvfb -h || true
- ./utils/install-sikulix.sh - ./utils/install-sikulix.sh
- export PATH="$HOME/sikulix/:$PATH" - export PATH="$HOME/sikulix/:$PATH"
- if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi - if test "$MODE" = virtualbox -o "$MODE" = self-test; then ./utils/install-virtualbox.sh; fi

2
Makefile
View File

@ -393,7 +393,7 @@ build/test_pass/sudo_iso_mount: ${os_filename} build/check_makefile | build/mnt_
.PHONY: test/macos .PHONY: test/macos
test/macos: build/check_makefile | deploy-screenshots test/macos: build/check_makefile | deploy-screenshots
sudo mkdir /tmp/.X11-unix sudo mkdir /tmp/.X11-unix
sudo chmod 1777 /tmp/.X11-unix sudo chmod a+rwxt /tmp/.X11-unix
xvfb :42 & \ xvfb :42 & \
sleep 10; \ sleep 10; \
DISPLAY=:42 xterm -e 'sh -c "echo hello; sleep 30"' & \ DISPLAY=:42 xterm -e 'sh -c "echo hello; sleep 30"' & \