diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd3f0c8b5e..ba74e23ac7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,10 @@ variables: CCACHE_DIR: "/ccache" GIT_DEPTH: 1 + + # The following values may be overwritten in GitLab's CI/CD Variables Settings. BUILD_PARALLEL_JOBS: 6 - TEST_PARALLEL_JOBS: 6 + TEST_PARALLEL_JOBS: 4 CONFIGURE: ./configure CLANG_VERSION: 15 diff --git a/bin/tests/system/dupsigs/tests.sh b/bin/tests/system/dupsigs/tests.sh index 205a4ed099..85218c68ee 100644 --- a/bin/tests/system/dupsigs/tests.sh +++ b/bin/tests/system/dupsigs/tests.sh @@ -38,7 +38,7 @@ end=$((start + 140)) while [ $now -lt $end ]; do et=$((now - start)) - echo "=============== $et ============" + echo "............... $et ............" $JOURNALPRINT ns1/signing.test.db.signed.jnl | $PERL check_journal.pl $DIG axfr signing.test -p ${PORT} @10.53.0.1 > dig.out.at$et awk '$4 == "RRSIG" { print $11 }' dig.out.at$et | sort | uniq -c diff --git a/bin/tests/system/get_algorithms.py b/bin/tests/system/get_algorithms.py index 5429649758..9cd07d4857 100755 --- a/bin/tests/system/get_algorithms.py +++ b/bin/tests/system/get_algorithms.py @@ -111,7 +111,10 @@ def is_supported(alg: Algorithm) -> bool: f"{TESTCRYPTO} -q {alg.name}", shell=True, check=True, - env={"KEYGEN": KEYGEN}, + env={ + "KEYGEN": KEYGEN, + "TMPDIR": os.getenv("TMPDIR", "/tmp"), + }, stdout=subprocess.DEVNULL, ) except subprocess.CalledProcessError as exc: diff --git a/bin/tests/system/get_core_dumps.sh b/bin/tests/system/get_core_dumps.sh new file mode 100755 index 0000000000..5d0255a2fd --- /dev/null +++ b/bin/tests/system/get_core_dumps.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +dir=$(dirname "$0") +. "$dir/conf.sh" + +systest=$1 +status=0 + +export SYSTESTDIR="${TOP_SRCDIR}/bin/tests/system/${systest}" + +get_core_dumps() { + find "$SYSTESTDIR/" \( -name 'core' -or -name 'core.*' -or -name '*.core' \) ! -name '*.gz' ! -name '*.txt' | sort +} + +core_dumps=$(get_core_dumps | tr '\n' ' ') +assertion_failures=$(find "$SYSTESTDIR/" -name named.run -exec grep "assertion failure" {} + | wc -l) +sanitizer_summaries=$(find "$SYSTESTDIR/" -name 'tsan.*' | wc -l) +if [ -n "$core_dumps" ]; then + status=1 + echoinfo "I:$systest:Core dump(s) found: $core_dumps" + get_core_dumps | while read -r coredump; do + echoinfo "D:$systest:backtrace from $coredump:" + echoinfo "D:$systest:--------------------------------------------------------------------------------" + binary=$(gdb --batch --core="$coredump" 2>/dev/null | sed -ne "s|Core was generated by \`\([^' ]*\)[' ].*|\1|p") + if [ ! -f "${binary}" ]; then + binary=$(find "${TOP_BUILDDIR}" -path "*/.libs/${binary}" -type f) + fi + "${TOP_BUILDDIR}/libtool" --mode=execute gdb \ + -batch \ + -ex bt \ + -core="$coredump" \ + -- \ + "$binary" 2>/dev/null | sed -n '/^Core was generated by/,$p' | cat_d + echoinfo "D:$systest:--------------------------------------------------------------------------------" + coredump_backtrace="${coredump}-backtrace.txt" + echoinfo "D:$systest:full backtrace from $coredump saved in $coredump_backtrace" + "${TOP_BUILDDIR}/libtool" --mode=execute gdb \ + -batch \ + -command=run.gdb \ + -core="$coredump" \ + -- \ + "$binary" > "$coredump_backtrace" 2>&1 + echoinfo "D:$systest:core dump $coredump archived as $coredump.gz" + gzip -1 "${coredump}" + done +elif [ "$assertion_failures" -ne 0 ]; then + status=1 + echoinfo "I:$systest:$assertion_failures assertion failure(s) found" + find "$SYSTESTDIR/" -name 'tsan.*' -exec grep "SUMMARY: " {} + | sort -u | cat_d +elif [ "$sanitizer_summaries" -ne 0 ]; then + status=1 + echoinfo "I:$systest:$sanitizer_summaries sanitizer report(s) found" +fi + +exit $status diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index 212e9ee4f1..d06f587732 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -113,7 +113,7 @@ if [ "${srcdir}" != "${builddir}" ]; then cp -a "${srcdir}/common" "${builddir}" fi # Some tests require additional files to work for out-of-tree test runs. - for file in ckdnsrps.sh conftest.py digcomp.pl ditch.pl fromhex.pl kasp.sh packet.pl pytest_custom_markers.py start.pl stop.pl testcrypto.sh; do + for file in ckdnsrps.sh conftest.py digcomp.pl ditch.pl fromhex.pl get_core_dumps.sh kasp.sh packet.pl pytest_custom_markers.py start.pl stop.pl testcrypto.sh; do if [ ! -r "${file}" ]; then cp -a "${srcdir}/${file}" "${builddir}" fi @@ -265,51 +265,7 @@ else exit $status fi -get_core_dumps() { - find "$systest/" \( -name 'core' -or -name 'core.*' -or -name '*.core' \) ! -name '*.gz' ! -name '*.txt' | sort -} - -core_dumps=$(get_core_dumps | tr '\n' ' ') -assertion_failures=$(find "$systest/" -name named.run -exec grep "assertion failure" {} + | wc -l) -sanitizer_summaries=$(find "$systest/" -name 'tsan.*' | wc -l) -if [ -n "$core_dumps" ]; then - status=1 - echoinfo "I:$systest:Core dump(s) found: $core_dumps" - get_core_dumps | while read -r coredump; do - export SYSTESTDIR="$systest" - echoinfo "D:$systest:backtrace from $coredump:" - echoinfo "D:$systest:--------------------------------------------------------------------------------" - binary=$(gdb --batch --core="$coredump" 2>/dev/null | sed -ne "s|Core was generated by \`\([^' ]*\)[' ].*|\1|p") - if [ ! -f "${binary}" ]; then - binary=$(find "${top_builddir}" -path "*/.libs/${binary}" -type f) - fi - "${top_builddir}/libtool" --mode=execute gdb \ - -batch \ - -ex bt \ - -core="$coredump" \ - -- \ - "$binary" 2>/dev/null | sed -n '/^Core was generated by/,$p' | cat_d - echoinfo "D:$systest:--------------------------------------------------------------------------------" - coredump_backtrace="${coredump}-backtrace.txt" - echoinfo "D:$systest:full backtrace from $coredump saved in $coredump_backtrace" - "${top_builddir}/libtool" --mode=execute gdb \ - -batch \ - -command=run.gdb \ - -core="$coredump" \ - -- \ - "$binary" > "$coredump_backtrace" 2>&1 - echoinfo "D:$systest:core dump $coredump archived as $coredump.gz" - gzip -1 "${coredump}" - done -elif [ "$assertion_failures" -ne 0 ]; then - status=1 - SYSTESTDIR="$systest" - echoinfo "I:$systest:$assertion_failures assertion failure(s) found" - find "$systest/" -name 'tsan.*' -exec grep "SUMMARY: " {} + | sort -u | cat_d -elif [ "$sanitizer_summaries" -ne 0 ]; then - status=1 - echoinfo "I:$systest:$sanitizer_summaries sanitizer report(s) found" -fi +$SHELL get_core_dumps.sh "$systest" || status=1 print_outstanding_files() { if test -d ${srcdir}/../../../.git; then diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh index 2be22f3652..ceaaf3726a 100755 --- a/bin/tests/system/testcrypto.sh +++ b/bin/tests/system/testcrypto.sh @@ -14,6 +14,7 @@ prog=$0 args="" quiet=0 +dir="" msg="cryptography" if test -z "$KEYGEN"; then @@ -74,9 +75,18 @@ if test -z "$alg"; then exit 1 fi +if test -n "$TMPDIR"; then + dir=$(mktemp -d "$TMPDIR/XXXXXX") + args="$args -K $dir" +fi + if $KEYGEN $args $alg foo > /dev/null 2>&1 then - rm -f Kfoo* + if test -z "$dir"; then + rm -f Kfoo* + else + rm -rf "$dir" + fi else if test $quiet -eq 0; then echo_i "This test requires support for $msg" >&2 diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl index 3677e200b2..e793874d93 100755 --- a/bin/tests/system/testsock.pl +++ b/bin/tests/system/testsock.pl @@ -15,6 +15,8 @@ require 5.001; +use Cwd 'abs_path'; +use File::Basename; use Socket; use Getopt::Long; @@ -27,7 +29,8 @@ my @ids; if ($id != 0) { @ids = ($id); } else { - my $fn = "ifconfig.sh"; + my $dir = dirname(abs_path($0)); + my $fn = "$dir/ifconfig.sh.in"; open FH, "< $fn" or die "open < $fn: $!\n"; while () { @ids = (1..$1)