Merge pull request #1473 from jan-cerny/arf_debug

Fix tests on Travis to not ignore their results

Author: evgenyz

.travis.yml

@@ -26,12 +26,14 @@ matrix:
             - swig
             - librtmp-dev
             - xsltproc
+            - rpm-common
+            - lua50
       before_script:
         - cd build
       script:
         - cmake -DCMAKE_BUILD_TYPE=Debug ../
         - build-wrapper-linux-x86-64 --out-dir bw-output make all || make all  # build-wrapper won't work on forked repositories.
-        - ctest --output-on-failure || true  # Tests won't pass on Ubuntu.
+        - ctest --output-on-failure
         - (cd .. && sonar-scanner) || true  # Will always fail builds on forked repositories.
       after_success:
         - curl -s https://codecov.io/bash > cov.sh && bash cov.sh -x "$GCOV"

docs/developer/developer.adoc

@@ -151,7 +151,13 @@ that you need to have these additional packages installed:
 wget lua which procps-ng initscripts chkconfig sendmail bzip2 rpm-build
 ----
 
-and it is also required to have `sendmail` service running on the system:
+On Ubuntu 18.04, also install:
+
+----
+rpm-common
+----
+
+It is also required to have `sendmail` service running on the system:
 
 ----
 $ systemctl start sendmail.service

tests/probes/rpm/rpminfo/test_probes_rpminfo.sh

@@ -17,13 +17,14 @@
 
 set -e -o pipefail
 
-require "rpm" || return 255
+require rpm || exit 255
 A_NAME=`rpm --qf "%{NAME}\n" -qa | sort | uniq -u | sed -n '1p'`
 B_NAME=`rpm --qf "%{NAME}\n" -qa | sort | uniq -u | sed -n '2p'`
 
+[ -n "$A_NAME" ] || exit 255
 
 test_init
 
 test_run "rpminfo probe test" test_probes_rpminfo $A_NAME $B_NAME
 
-test_exit
+test_exit

tests/probes/rpm/rpmverify/test_probes_rpmverify_not_equals_operation.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 . $builddir/tests/test_common.sh
 
@@ -7,6 +7,8 @@ set -e -o pipefail
 
 function perform_test {
     probecheck "rpmverify" || return 255
+    require rpm || return 255
+    rpm -qf /root || return 255
 
     DF="$srcdir/test_probes_rpmverify_not_equals_operation.xml"
     RF="results.xml"

tests/probes/rpm/rpmverify/test_probes_rpmverify_not_equals_operation_offline.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 . $builddir/tests/test_common.sh
 . $srcdir/../rpm_common.sh

tests/probes/rpm/rpmverifypackage/rpmverifypackage.xml.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 # This template generates OVAL definitions for rpmverifypackage_object.