Merge branch 'travis-tests'

Fix problems with travis environment.

.travis.yml

@@ -1,17 +1,24 @@
 ---
-language: perl
+dist: trusty
 install:
   - sudo apt-get update
   - sudo apt-get --no-install-recommends install devscripts python python3 ruby php5-cli gawk ksh zsh pylint
   - sudo apt-get --no-install-recommends install pkg-config libdb-dev libvirt-dev libexpat-dev
   # - Munin/Plugin.pm is in "munin-node" on precise
   - sudo apt-get --no-install-recommends install munin-node
+  - sudo apt-get --no-install-recommends install libsys-virt-perl
+
+  # we use locally installed cpan modules instead of travis' builtin 'homebrew' perl support
+  # The homebrew variation does not work for us, since:
+  #   * it is built without threading
+  #   * the 'libvirt' plugin requires Sys::Virt, which is not available via cpan anymore - thus we need to install the Debian package 'libsys-virt-perl', which was built with threading
+  - cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
 
   # Modules used by test script
   - cpanm --notest Capture::Tiny
   - cpanm --notest File::Find
   - cpanm --notest Test::More
-  #
+
   # Modules used by plugins
   - cpanm --notest Asterisk::AMI
   - cpanm --notest BerkeleyDB
@@ -42,8 +49,9 @@ install:
   - cpanm --notest POE::Quickie
   - cpanm --notest Proc::ProcessTable
   - cpanm --notest Redis
-  - cpanm --notest WWW::Mechanize::TreeBuilder
+  - cpanm --notest Switch
   - cpanm --notest Text::Iconv
+  - cpanm --notest WWW::Mechanize::TreeBuilder
   - cpanm --notest YAML
   - cpanm --notest XML::LibXML
   - cpanm --notest XML::Simple
@@ -51,11 +59,11 @@ install:
   - cpanm --notest XML::Twig
   - cpanm --notest nvidia::ml
   - cpanm --notest experimental
-  # - Sys::Virt version matching the test system's libvirt-dev
-  - cpanm --notest DANBERR/Sys-Virt-0.9.8.tar.gz
   # Modules used by plugins, but missing on cpan
   # - File::Tail::Multi
   # - Sun::Solaris::Kstat
   # - VMware::VIRuntime
   # - MythTV
-script: "PERL5LIB=$PERL5LIB:/usr/share/perl5 prove"
+
+script:
+  - prove