X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=.travis.yml;h=4fbb56ff5aaa898862ce62ad7b5a6db9a685c96c;hp=96e0db6b8748a2fcac30715c5236b0b80ed8ff1c;hb=4e93cdb6d9403718baff430bc1bdc3245aa5236f;hpb=72e70934c716ddf0353396797e893866614eace7

diff --git a/.travis.yml b/.travis.yml
index 96e0db6..4fbb56f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,12 @@ before_install:
    - eval $(curl https://travis-perl.github.io/init) --perl
    - $HELPERS_ROOT/bin/cpan-config
 install:
-   - cpanm --notest --metacpan --skip-satisfied --with-develop --installdeps .
-   - perl Makefile.PL
+   - build-dist
+   - cd $BUILD_DIR
+   - cpanm -q --showdeps --with-develop . | grep -v "^perl[~@]" | AUTHOR_TESTING=0 cpanm --notest --metacpan --skip-satisfied
+
+   - test_run='make test'
+   - AUTHOR_TESTING=0 cpanm --notest --metacpan --skip-satisfied Test2::Harness && test_run='yath test t xt' || true
 
    # enable various test options, including parallel testing
    - export AUTOMATED_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1
@@ -34,10 +38,8 @@ install:
    - export RELEASE_TESTING=1
    - export PERL_AUTOINSTALL=--skip
 
-   - make manifest
-
 script:
-   - make disttest
+   - make && $test_run
 
    # Test reverse deps (high-profile modules, taken from from Task::Catalyst):
    #  (note: currently skipping DBIC deps for speed)
@@ -48,19 +50,21 @@ script:
 
    # pure author deps (of reverse deps):
    - cpanm --notest --metacpan --skip-satisfied YAML::Syck
+   - cpanm --notest --metacpan Carp::Assert::More@1.16
+   - cpanm --notest --metacpan Test::WWW::Mechanize@1.50
 
    # both author deps & reverse deps:
-   - cpanm --metacpan --skip-satisfied Catalyst::View::TT
-   - cpanm --metacpan --skip-satisfied Catalyst::Plugin::Authentication
+   - cpanm --metacpan --skip-satisfied Catalyst::View::TT || ( cat ~/.cpanm/build.log; false )
+   - cpanm --metacpan --skip-satisfied Catalyst::Plugin::Authentication || ( cat ~/.cpanm/build.log; false )
 
    # pure reverse deps (call with --test-only):
-   - cpanm --test-only --metacpan -v Catalyst::Devel || ( cat ~/.cpanm/build.log; false )
-   - cpanm --test-only --metacpan -v Catalyst::Action::REST || ( cat ~/.cpanm/build.log; false )
-   - cpanm --test-only --metacpan -v Catalyst::Component::InstancePerContext || ( cat ~/.cpanm/build.log; false )
-   - cpanm --test-only --metacpan -v Catalyst::Plugin::Session || ( cat ~/.cpanm/build.log; false )
-   - cpanm --test-only --metacpan -v Catalyst::Plugin::Session::State::Cookie || ( cat ~/.cpanm/build.log; false )
-   - cpanm --test-only --metacpan -v Catalyst::Plugin::Static::Simple || ( cat ~/.cpanm/build.log; false )
-   - cpanm --test-only --metacpan -v Catalyst::Plugin::ConfigLoader || ( cat ~/.cpanm/build.log; false )
+   - cpanm --test-only --metacpan -v Catalyst::Devel
+   - cpanm --test-only --metacpan -v Catalyst::Action::REST
+   - cpanm --test-only --metacpan -v Catalyst::Component::InstancePerContext
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::Session
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::Session::State::Cookie
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::Static::Simple
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::ConfigLoader
    #- cpanm --test-only --verbose --metacpan Catalyst::Authentication::Credential::HTTP
 
    # Still need to figure out why these fail in travis: