...
 
Commits (3)
  • Michal Nowak's avatar
    Add out-of-tree system test job · 6e99927e
    Michal Nowak authored
    In addition to the new out-of-tree system test job, rename the
    variable holding the name of the out-of-tree directory to a more generic
    name.
    6e99927e
  • Michal Nowak's avatar
    Do not remove $systest on out-of-tree builds · 8de82ed6
    Michal Nowak authored
    Previously, $systest directory was removed for out-of-tree builds. For
    directories with compiled content (binaries), this breaks subsequent
    make invocations:
    
        make: Target 'check' not remade because of errors.
        Making all in dyndb/driver
        /bin/bash: line 20: cd: dyndb/driver: No such file or directory
        Making all in dlzexternal/driver
        /bin/bash: line 20: cd: dlzexternal/driver: No such file or directory
    
    Current approach removes only files known to Git and empty directories
    in $systest (including $systest).
    8de82ed6
  • Michal Nowak's avatar
    DROPME: Facilitates testing · a5f61cac
    Michal Nowak authored
    a5f61cac
......@@ -195,7 +195,7 @@ stages:
stage: build
before_script:
- test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
- test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
- test -n "${OUT_OF_TREE_WORKSPACE}" && mkdir "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
script:
- *configure
- make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
......@@ -253,6 +253,7 @@ stages:
<<: *default_triggering_rules
stage: system
before_script:
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
- *setup_interfaces
- *setup_softhsm
script:
......@@ -481,7 +482,7 @@ docs:
stage: docs
before_script:
- test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
- test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
- test -n "${OUT_OF_TREE_WORKSPACE}" && mkdir "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
script:
- *configure
- make -j${BUILD_PARALLEL_JOBS:-1} -k doc V=1
......@@ -697,10 +698,19 @@ gcc:out-of-tree:
CONFIGURE: ../configure
EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --with-lmdb"
RUN_MAKE_INSTALL: 1
OOT_BUILD_WORKSPACE: workspace
OUT_OF_TREE_WORKSPACE: workspace
<<: *base_image
<<: *build_job
system:gcc:out-of-tree:
variables:
OUT_OF_TREE_WORKSPACE: workspace
needs:
- job: gcc:out-of-tree
artifacts: true
<<: *base_image
<<: *system_test_job
# Jobs for tarball GCC builds on Debian 10 "buster" (amd64)
gcc:tarball:
......
......@@ -17,7 +17,7 @@
DIGOPTS="+norec -p ${PORT}"
status=0
status=1
echo_i "testing that a ccTLD referral gets a full glue set from the root zone"
$DIG $DIGOPTS @10.53.0.1 foo.bar.fi. A >dig.out || status=1
......
......@@ -294,20 +294,26 @@ elif [ "$sanitizer_summaries" -ne 0 ]; then
echoinfo "I:$systest:$sanitizer_summaries sanitizer report(s) found"
fi
print_outstanding_files() {
if test -d ${srcdir}/../../../.git; then
git status -su --ignored "${systest}" 2>/dev/null | \
sed -n -e 's|^?? \(.*\)|\1|p' \
-e 's|^!! \(.*/named.run\)$|\1|p' \
-e 's|^!! \(.*/named.memstats\)$|\1|p'
fi
}
if [ $status -ne 0 ]; then
echofail "R:$systest:FAIL"
else
echopass "R:$systest:PASS"
if $clean; then
( cd "${systest}" && $SHELL clean.sh "$@" )
if [ "${srcdir}" != "${builddir}" ]; then
rm -rf "./${systest}" ## FIXME (this also removes compiled binaries)
fi
if test -d ${srcdir}/../../../.git; then
git status -su --ignored "${systest}" 2>/dev/null | \
sed -n -e 's|^?? \(.*\)|I:file \1 not removed|p' \
-e 's|^!! \(.*/named.run\)$|I:file \1 not removed|p' \
-e 's|^!! \(.*/named.memstats\)$|I:file \1 not removed|p'
if [ "${srcdir}" = "${builddir}" ]; then
print_outstanding_files
else
print_outstanding_files | xargs rm -rfv
find "./${systest}" \( -type d -empty -o -name Makefile.in \) -delete
fi
fi
fi
......