koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement fake-outputs option (cmdline, cfg) for multi-monitor testing

Browse Source 
This kills the dependency on xdmx and makes the testsuite simpler
and more flexible (in the output sizes / configurations).
This commit is contained in:
Michael Stapelberg
2012-04-09 14:27:33 +02:00
parent fa6a3d57d2
commit 0f10ccdf12
15 changed files with 223 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
testcases/complete-run.pl
View File

@ -72,16 +72,9 @@ my @testfiles = @ARGV;
my $numtests = scalar @testfiles;
# When the user specifies displays, we don’t run multi-monitor tests at all
# (because we don’t know which displaynumber is the X-Server with multiple
# monitors).
my $multidpy = undef;
# No displays specified, let’s start some Xdummy instances.
if (@displays == 0) {
my $dpyref;
($dpyref, $multidpy) = start_xdummy($parallel, $numtests);
@displays = @$dpyref;
@displays = start_xdummy($parallel, $numtests);
}
# 1: create an output directory for this test-run
@ -111,16 +104,6 @@ for my $display (@displays) {
}
}
my @multi_worker;
if (defined($multidpy)) {
my $x = X11::XCB::Connection->new(display => $multidpy);
if ($x->has_error) {
die "Could not connect to multi-monitor display $multidpy\n";
} else {
push @multi_worker, worker($multidpy, $x, $outdir, \%options);
}
}
# Read previous timing information, if available. We will be able to roughly
# predict the test duration and schedule a good order for the tests.
my $timingsjson = StartXDummy::slurp('.last_run_timings.json');
@ -149,30 +132,21 @@ my @done;
my $num = @testfiles;
my $harness = TAP::Harness->new({ });
my @single_monitor_tests = grep { m,^t/([0-9]+)-, && $1 < 500 } @testfiles;
my @multi_monitor_tests = grep { m,^t/([0-9]+)-, && $1 >= 500 } @testfiles;
my $aggregator = TAP::Parser::Aggregator->new();
$aggregator->start();
status_init(displays => [ @displays, $multidpy ], tests => $num);
status_init(displays => \@displays, tests => $num);
my $single_cv = AE::cv;
my $multi_cv = AE::cv;
# We start tests concurrently: For each display, one test gets started. Every
# test starts another test after completing.
for (@single_worker) {
$single_cv->begin;
take_job($_, $single_cv, \@single_monitor_tests);
}
for (@multi_worker) {
$multi_cv->begin;
take_job($_, $multi_cv, \@multi_monitor_tests);
take_job($_, $single_cv, \@testfiles);
}
$single_cv->recv;
$multi_cv->recv;
$aggregator->stop();