summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-09-28 02:11:09 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-09-28 02:11:09 +0200
commit5e60401434b64cb6a890d26dbc924043a47c90aa (patch)
tree0df6750e55b0f2e137a615ef555ae5bdb93da18e
parent2bedd7b161077127b85cb5d1fe9bd41b0ec4e5ff (diff)
downloadfeh-5e60401434b64cb6a890d26dbc924043a47c90aa.zip
test-x11: Switch to Xephyr
-rw-r--r--README2
-rwxr-xr-xtest/feh-bg.i2
-rwxr-xr-xtest/run-interactive2
3 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index e5ebd5e..2d3cf9c 100644
--- a/README
+++ b/README
@@ -66,7 +66,7 @@ Requires
* import (usually supplied by imagemagick)
* perl >= 5.10 with GD, Test::More and X11::GUITest
* twm
- * Xnest
+ * Xephyr
$ make test-x11
diff --git a/test/feh-bg.i b/test/feh-bg.i
index 3624f5c..0e3b546 100755
--- a/test/feh-bg.i
+++ b/test/feh-bg.i
@@ -42,7 +42,7 @@ sub check_bg {
}
if (($pid_xnest = fork()) == 0) {
- exec(qw( Xnest -geometry 500x500 :7 ));
+ exec(qw( Xephyr -screen 500x500 :7 ));
}
sleep(0.5);
diff --git a/test/run-interactive b/test/run-interactive
index fab6517..d801ac6 100755
--- a/test/run-interactive
+++ b/test/run-interactive
@@ -1,6 +1,6 @@
#!/bin/sh
-Xnest -geometry 500x500 :7 > /dev/null 2>&1 &
+Xephyr -screen 500x500 :7 > /dev/null 2>&1 &
pid=${!}
DISPLAY=:7 prove test/feh-scr.i test/feh.i