Skip to content

Commit 2ddbc71

Browse files
Tony Criscistapelberg
Tony Crisci
authored andcommitted
Testcases: Use Xephyr instead of XDummy
Replace the XDummy script with Xephyr. This is done because of some changes in the Xorg server that make XDummy difficult to use. Rename library internal variables and function names to replace "xdummy" with "xserver" to show this change (except for renaming the package and lib file for better git history). Rename the switch `--keep-xdummy-output` to `--keep-xserver-output`. This switch should now be rarely used because Xephyr requires less set up. Replace "xdummy" with "xephyr" in comments and utility help information. Update docs to show the new dependency. fixes i3#1367
1 parent ea2552e commit 2ddbc71

File tree

6 files changed

+43
-1977
lines changed

6 files changed

+43
-1977
lines changed

docs/testsuite

+10-10
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ client, simply called +cpan+. It comes with every Perl installation and can be
7474
used to install the testsuite. Many users prefer to use the more modern
7575
+cpanminus+ instead, though (because it asks no questions and just works):
7676

77+
The tests additionally require +Xephyr(1)+ to run a nested X server. Install
78+
+xserver-xephyr+ on Debian or +xorg-xserver-xephyr+ on Arch Linux.
79+
7780
.Installing testsuite dependencies using cpanminus (preferred)
7881
--------------------------------------------------------------------------------
7982
$ cd ~/i3/testcases
@@ -102,7 +105,7 @@ more testcases. Also, it takes care of starting up a separate instance of i3
102105
with an appropriate configuration file and creates a folder for each run
103106
containing the appropriate i3 logfile for each testcase. The latest folder can
104107
always be found under the symlink +latest/+. Unless told differently, it will
105-
run the tests on a separate X server instance (using the Xdummy script).
108+
run the tests on a separate X server instance (using Xephyr).
106109

107110
.Example invocation of complete-run.pl+
108111
---------------------------------------
@@ -146,12 +149,11 @@ $ less latest/i3-log-for-04-floating.t
146149
If your attempt to run the tests with a bare call to ./complete-run.pl fails, try this:
147150

148151
---------------------------------------------------
149-
$ ./complete-run.pl --parallel=1 --keep-xdummy-output
152+
$ ./complete-run.pl --parallel=1 --keep-xserver-output
150153
---------------------------------------------------
151154

152-
One common cause of failures is not having the X dummy server module
153-
installed. Under Debian and Ubuntu this is the package
154-
+xserver-xorg-video-dummy+.
155+
This will show the output of Xephyr, which is the X server implementation we
156+
use for testing.
155157

156158
==== IPC interface
157159

@@ -175,10 +177,9 @@ manager.
175177
=== Filesystem structure
176178

177179
In the git root of i3, the testcases live in the folder +testcases+. This
178-
folder contains the +complete-run.pl+ and +Xdummy+ scripts and a base
179-
configuration file which will be used for the tests. The different testcases
180-
(their file extension is .t, not .pl) themselves can be found in the
181-
conventionally named subfolder +t+:
180+
folder contains the +complete-run.pl+ and a base configuration file which will
181+
be used for the tests. The different testcases (their file extension is .t, not
182+
.pl) themselves can be found in the conventionally named subfolder +t+:
182183

183184
.Filesystem structure
184185
--------------------------------------------
@@ -197,7 +198,6 @@ conventionally named subfolder +t+:
197198
│   │   ├── omitted for brevity
198199
│   │   ├── ...
199200
│   │   └── 74-regress-focus-toggle.t
200-
│   └── Xdummy
201201
--------------------------------------------
202202

203203
== Anatomy of a testcase

testcases/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ inc
88
META.yml
99
i3-cfg-for-*
1010
-
11-
Xdummy.so

0 commit comments

Comments
 (0)