tests: Minor test improvements

1. Ensure that a keyboard interrupt signal terminates a test run
2. Check required Perl modules before running tests

Signed-off-by: Peter Oberparleiter <[email protected]>

Author: oberpar

tests/bin/checkdeps

@@ -0,0 +1,63 @@
+#!/usr/bin/env perl
+#
+# Copyright IBM Corp. 2020
+#
+# Usage: checkdeps <perl-file1> [<perl-file2> ...]
+#
+# Check if all Perl modules required by the Perl programs specified on the
+# command line are available. Note that this is a simple check that will only
+# catch straight-forward use directives.
+#
+# Example:
+# $ checkdeps file.pl file2.pl
+#
+
+use strict;
+use warnings;
+
+my $verbose = 0;
+
+sub check_file($)
+{
+	my ($file) = @_;
+	my $fd;
+	my $line;
+	my $rc = 0;
+
+	open($fd, "<", $file) or die("Could not open $file: $!\n");
+	$line = <$fd>;
+
+	if ($line =~ /^#.*perl/) {
+		while ($line = <$fd>) {
+			my $module;
+
+			# Look for ...use...module...;
+			next if ($line !~ /^\s*use\s+(\S+).*;\s*$/);
+
+			$module = $1;
+			print("Checking for $module\n") if ($verbose);
+			if (!eval("require $module")) {
+				warn("Error: Missing Perl module '$module' ".
+				     "required by $file\n");
+				$rc = 1;
+			}
+		}
+	}
+
+	close($fd);
+
+	return $rc;
+}
+
+sub main()
+{
+	my $rc = 0;
+
+	for my $file (@ARGV) {
+		$rc = 1 if (check_file($file));
+	}
+
+	return $rc;
+}
+
+exit(main());

tests/bin/runtests

@@ -15,17 +15,19 @@ if [[ -z "${_TESTS_RUNNING}" ]] ; then
 
 	testsuite_init
 	trap testsuite_exit exit
+	# Suppress test results on keyboard interrupt
+	trap "trap exit ; exit 1" SIGINT
 fi
 
 for TEST in ${TESTS} ; do
 	if [[ -d "${TEST}" ]] ; then
 		# Enter sub-directory
-		${MAKE} -C "${TEST}" check
+		${MAKE} -C "${TEST}" check || exit 1
 	else
 		# Enter test
 		ABS_TEST="$PWD/$TEST"
 		REL_TEST="${ABS_TEST##$TOPDIR}"
-		test_run "${REL_TEST}" "${ABS_TEST}" </dev/null
+		test_run "${REL_TEST}" "${ABS_TEST}" </dev/null || exit 1
 	fi
 done
 

tests/bin/test_run

@@ -8,6 +8,8 @@
 # test log file. Must be run after testsuite_init.
 #
 
+trap 'echo ; exit 1' SIGINT
+
 TOPDIR=$(realpath $(dirname $0)/..) && source "$TOPDIR/bin/common"
 EXCERPTLEN=10
 TESTNAME="$1"

tests/common.mak

@@ -43,15 +43,28 @@ endif
 #   make TESTS=subdir
 MAKEOVERRIDES := $(filter-out TESTS=%,$(MAKEOVERRIDES))
 
-check: prepare
+# Default target
+check:
 	runtests "$(MAKE)" $(TESTS)
 
+ifeq ($(_ONCE),)
+
+# Do these only once during initialization
+export _ONCE := 1
+
+check: checkdeps prepare
+
+checkdeps:
+	checkdeps $(TOPDIR)/../bin/* $(TOPDIR)/bin/*
+
 prepare: $(INFOFILES) $(COUNTFILES)
 
 # Create artificial info files as test data
 $(INFOFILES) $(COUNTFILES):
 	cd $(TOPDIR) && mkinfo profiles/$(SIZE) -o src/
 
+endif
+
 clean: clean_echo clean_subdirs
 
 clean_echo: