Commit f71e24c8 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Run X tests in Xnest. Kinda buggy so far, but still better than before

parent 3e1f8197

Makefile

+1 −9
Original line number Diff line number Diff line
@@ -7,15 +7,7 @@ test: all 
	@PACKAGE=${PACKAGE} VERSION=${VERSION} prove test



test-interactive: all

	@if [ "$$(whoami)" != derf ]; then \

		echo "Note: This will do stuff with your X and take a while"; \

		echo "If you don't know what's going on, hit ^C now"; \

		sleep 5; \

		echo "Okay, running test"; \

	fi

	@if [ "$$(whoami)" = derf ]; then setxkbmap us; fi

	@prove test/*.i

	@if [ "$$(whoami)" = derf ]; then setxkbmap greedy; fi

	@test/run-interactive



install: install-man install-doc install-bin install-font install-img

test/feh.i

+7 −1
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ use Test::More tests => 30; 
use X11::GUITest qw/

	FindWindowLike

	GetWindowName

	StartApp

	SetInputFocus

	SendKeys

	StartApp

	WaitWindowViewable

/;
@@ -28,6 +29,10 @@ sub feh_start { 
		BAIL_OUT("Unable to start feh ${opts} ${files}");

	}



	if (not SetInputFocus($id)) {

		BAIL_OUT("Unable to focus window");

	}



	return $id;

}
@@ -126,6 +131,7 @@ $win = feh_start('--cycle-once --slideshow-delay -0.01', 
sleep(0.1);

test_win_title($win, 'feh [1 of 3] - test/ok.png');

SendKeys('h');

sleep(1);

test_no_win('cycle-once + negative delay + [h]');



$win = feh_start(q{}, 'test/ok.png test/ok.gif test/ok.gif test/ok.jpg');

test/run-interactive

0 → 100755
+8 −0
Original line number Diff line number Diff line 
#!/bin/sh



Xnest :1 &

pid=${!}



DISPLAY=:1 prove test/feh.i



kill ${pid}