nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testcases: remove external AnyEvent::I3 dependency

This commit is contained in:
Michael Stapelberg 2017-08-19 16:51:51 +02:00
parent 062ecdb0b5
commit a91544b5b3
7 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -53,6 +53,9 @@ check_PROGRAMS = \
check_SCRIPTS = \ check_SCRIPTS = \
testcases/complete-run.pl testcases/complete-run.pl
check_DATA = \
anyevent-i3.stamp
clean-check: clean-check:
rm -rf testsuite-* latest i3-cfg-for-* _Inline rm -rf testsuite-* latest i3-cfg-for-* _Inline
clean-local: clean-check clean-local: clean-check
@ -573,6 +576,15 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-command-parser.pl parser-spe
$(AM_V_at) mv GENERATED_config_* $(top_builddir)/parser $(AM_V_at) mv GENERATED_config_* $(top_builddir)/parser
$(AM_V_at) touch $@ $(AM_V_at) touch $@
################################################################################
# AnyEvent-I3 build process
################################################################################
anyevent-i3.stamp: generate-command-parser.pl parser-specs/config.spec
$(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL && make)
$(AM_V_at) touch $@
CLEANFILES = \ CLEANFILES = \
i3-command-parser.stamp \ i3-command-parser.stamp \
i3-config-parser.stamp i3-config-parser.stamp \
anyevent-i3.stamp

1
testcases/Makefile.PL
View File

@ -8,7 +8,6 @@ WriteMakefile(
MIN_PERL_VERSION => '5.010000', # 5.10.0 MIN_PERL_VERSION => '5.010000', # 5.10.0
PREREQ_PM => { PREREQ_PM => {
'AnyEvent' => 0, 'AnyEvent' => 0,
'AnyEvent::I3' => '0.16',
'X11::XCB' => '0.12', 'X11::XCB' => '0.12',
'Inline' => 0, 'Inline' => 0,
'Inline::C' => 0, 'Inline::C' => 0,

2
testcases/complete-run.pl.in
View File

@ -18,7 +18,7 @@ use Time::HiRes qw(time);
use IO::Handle; use IO::Handle;
# these are shipped with the testsuite # these are shipped with the testsuite
use lib qw(@abs_top_builddir@/testcases/lib @abs_top_srcdir@/testcases/lib); use lib qw(@abs_top_builddir@/testcases/lib @abs_top_srcdir@/testcases/lib @abs_top_srcdir@/AnyEvent-I3/blib/lib);
use i3test::Util qw(slurp); use i3test::Util qw(slurp);
use StartXServer; use StartXServer;
use StatusLine; use StatusLine;

1
testcases/lib/i3test.pm.in
View File

@ -7,6 +7,7 @@ use Test::Builder;
use X11::XCB::Rect; use X11::XCB::Rect;
use X11::XCB::Window; use X11::XCB::Window;
use X11::XCB qw(:all); use X11::XCB qw(:all);
use lib qw(@abs_top_srcdir@/AnyEvent-I3/blib/lib);
use AnyEvent::I3; use AnyEvent::I3;
use List::Util qw(first); use List::Util qw(first);
use Time::HiRes qw(sleep); use Time::HiRes qw(sleep);

1
testcases/lib/i3test/XTEST.pm
View File

@ -6,6 +6,7 @@ use warnings;
use v5.10; use v5.10;
use i3test i3_autostart => 0; use i3test i3_autostart => 0;
use lib qw(@abs_top_srcdir@/AnyEvent-I3/blib/lib);
use AnyEvent::I3; use AnyEvent::I3;
use ExtUtils::PkgConfig; use ExtUtils::PkgConfig;

1
testcases/t/000-load-deps.t
View File

@ -8,7 +8,6 @@ BEGIN {
X11::XCB::Connection X11::XCB::Connection
X11::XCB::Window X11::XCB::Window
AnyEvent AnyEvent
AnyEvent::I3
IPC::Run IPC::Run
ExtUtils::PkgConfig ExtUtils::PkgConfig
Inline Inline

2
travis/travis-base.Dockerfile
View File

@ -19,7 +19,7 @@ RUN apt-get update && \
dpkg-dev devscripts git equivs \ dpkg-dev devscripts git equivs \
clang clang-format-3.8 \ clang clang-format-3.8 \
lintian \ lintian \
libanyevent-perl libanyevent-i3-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libinline-c-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libipc-run-perl libxcb-xtest0-dev libx11-xcb-perl libanyevent-i3-perl && \ libmodule-install-perl libanyevent-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libinline-c-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libipc-run-perl libxcb-xtest0-dev libx11-xcb-perl libjson-xs-perl && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install i3 build dependencies. # Install i3 build dependencies.