testcases: remove external AnyEvent::I3 dependency

diff --git a/Makefile.am b/Makefile.am
index 188e9e82b14f758368218d35af2ec328dcd34624..ec28991cf706fa49801df4adf6f7ad3433e8d66e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,9 @@ check_PROGRAMS = \
 check_SCRIPTS = \
        testcases/complete-run.pl
 
+check_DATA = \
+       anyevent-i3.stamp
+
 clean-check:
        rm -rf testsuite-* latest i3-cfg-for-* _Inline
 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) 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 = \
        i3-command-parser.stamp \
-       i3-config-parser.stamp
+       i3-config-parser.stamp \
+       anyevent-i3.stamp

diff --git a/testcases/Makefile.PL b/testcases/Makefile.PL
index 3c2a26f97255c09161e13c03f48ee4658aaa8b0e..0b1f305592a14e806bb5ae4920a1404ed05761f5 100755 (executable)
--- a/testcases/Makefile.PL
+++ b/testcases/Makefile.PL
@@ -8,7 +8,6 @@ WriteMakefile(
     MIN_PERL_VERSION => '5.010000', # 5.10.0
     PREREQ_PM => {
         'AnyEvent'     => 0,
-        'AnyEvent::I3' => '0.16',
         'X11::XCB'     => '0.12',
         'Inline'       => 0,
         'Inline::C'    => 0,

diff --git a/testcases/complete-run.pl.in b/testcases/complete-run.pl.in
index 2019253c49ca99965d9ac00941f73d2f03d1acef..ba192469e6867fa8ebda0c8b7c5a6b6733776a9e 100755 (executable)
--- a/testcases/complete-run.pl.in
+++ b/testcases/complete-run.pl.in
@@ -18,7 +18,7 @@ use Time::HiRes qw(time);
 use IO::Handle;
 
 # 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 StartXServer;
 use StatusLine;

diff --git a/testcases/lib/i3test.pm.in b/testcases/lib/i3test.pm.in
index f7e1515d168cdb6fe7e00f838445122b9b9f7132..18bebb52146ed0dba8e2471d565c1a1118f9520f 100644 (file)
--- a/testcases/lib/i3test.pm.in
+++ b/testcases/lib/i3test.pm.in
@@ -7,6 +7,7 @@ use Test::Builder;
 use X11::XCB::Rect;
 use X11::XCB::Window;
 use X11::XCB qw(:all);
+use lib qw(@abs_top_srcdir@/AnyEvent-I3/blib/lib);
 use AnyEvent::I3;
 use List::Util qw(first);
 use Time::HiRes qw(sleep);

diff --git a/testcases/lib/i3test/XTEST.pm b/testcases/lib/i3test/XTEST.pm
index 92adde42f0683af3d653132f2ae9a98af3330f71..3937b70acd65c934f3ff46f616199b9170f7dc2d 100644 (file)
--- a/testcases/lib/i3test/XTEST.pm
+++ b/testcases/lib/i3test/XTEST.pm
@@ -6,6 +6,7 @@ use warnings;
 use v5.10;
 
 use i3test i3_autostart => 0;
+use lib qw(@abs_top_srcdir@/AnyEvent-I3/blib/lib);
 use AnyEvent::I3;
 use ExtUtils::PkgConfig;
 

diff --git a/testcases/t/000-load-deps.t b/testcases/t/000-load-deps.t
index ab93233a23654f368c96d21a2bed6acdc119277e..e0408338c2d1dd974d48ade772e1c2742c34cce0 100644 (file)
--- a/testcases/t/000-load-deps.t
+++ b/testcases/t/000-load-deps.t
@@ -8,7 +8,6 @@ BEGIN {
         X11::XCB::Connection
         X11::XCB::Window
         AnyEvent
-        AnyEvent::I3
         IPC::Run
         ExtUtils::PkgConfig
         Inline

diff --git a/travis/travis-base.Dockerfile b/travis/travis-base.Dockerfile
index a415f549a6681251930d26ccf2160ea0e20afc57..5704d8e4636587fd0ee21dcbf7e477da6b27a293 100644 (file)
--- a/travis/travis-base.Dockerfile
+++ b/travis/travis-base.Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && \
     dpkg-dev devscripts git equivs \
     clang clang-format-3.8 \
     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/*
 
 # Install i3 build dependencies.