Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reactivate integration tests #85

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@ language: c
compiler:
- gcc
- clang
addons:
apt:
packages:
- xvfb
install:
- export DISPLAY=':99.0'
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
env:
-
- USE_XFT=0
before_install: sudo apt-get install lua5.2 liblua5.2-dev gettext libxft-dev libxinerama-dev libxrandr-dev libreadline-dev
before_install:
- sudo apt-get install lua5.2 liblua5.2-dev gettext libxft-dev libxinerama-dev libxrandr-dev libreadline-dev lua-posix
- sudo ln -sf /usr/lib/x86_64-linux-gnu/lua/5.2/posix_c.so /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so
script:
- make
- make test
3 changes: 1 addition & 2 deletions test/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.PHONY: test

test:
# For now integration tests don't work (lua-posix problems), skipping them
#$(MAKE) -C integration test
$(MAKE) -C integration test
3 changes: 3 additions & 0 deletions test/integration/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
TOPDIR=../..
include $(TOPDIR)/system-autodetect.mk

.PHONY: test

libXinerama.so.1.0: Xinerama.c
Expand Down
11 changes: 6 additions & 5 deletions test/integration/README
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@ Each subdirectory here is an integration test.

== Requirements ==

- xserver-xorg-video-dummy
- lposix (aka lua-posix in Debian)
- xserver-xorg-video-dummy
- luaposix (aka lua-posix in Debian)
- Debian base distros: ```apt-get install lua-posix```
- All distros using luarocks: ```luarocks install luaposix```

== Running the tests ==

Install notion and run 'make test'
Run ```make test``` on notion's source directory

== How it works ==

Each integration test basically looks like this:
- Start a dummy X server (Xdummy)
- Start a dummy X server (X's dummy dirver)
- Start notion with the configuration in $test/config
- basically $test/config behaves like the ~user/.notion dir for this test
- Right now this starts the currenly *installed* notion.
Expand All @@ -28,6 +30,5 @@ Each integration test basically looks like this:

- the x.org dummy driver does not appear to support RandR
- .. but we might be able to test some of the mod_xinerama stuff with fakexinerama
- there might be some SELINUX noise, probably due to the way Xdummy works
- Xdummy doesn't properly autodetect which X ports are free, so we use a fixed
value of :7
Loading