mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 00:25:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'pspacek/fix-out-of-tree-junit' into 'main'

Browse Source 
Improve JUnit test status generator for Gitlab CI

See merge request isc-projects/bind9!6166
This commit is contained in:
Petr Špaček
2022-09-22 14:16:05 +00:00
parent e5ff78dfbd 8d095550a8
commit 5bfec15ad4
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.gitlab-ci.yml
View File

@@ -241,6 +241,11 @@ stages:
$EXTRA_CONFIGURE $EXTRA_CONFIGURE
|| (test -s config.log && cat config.log; exit 1) || (test -s config.log && cat config.log; exit 1)
# change directory to the workspace before including this
.find_python: &find_python
- PYTHON="$(source bin/tests/system/conf.sh; echo $PYTHON)"
- test -x "$PYTHON"
.check_readline_setup: &check_readline_setup .check_readline_setup: &check_readline_setup
- if [[ -n "${WITHOUT_READLINE}" ]]; then - if [[ -n "${WITHOUT_READLINE}" ]]; then
! grep "^#define HAVE_READLINE" config.h; ! grep "^#define HAVE_READLINE" config.h;
@@ -305,10 +310,13 @@ stages:
- make -j${TEST_PARALLEL_JOBS:-1} -k check V=1 - make -j${TEST_PARALLEL_JOBS:-1} -k check V=1
- if git rev-parse > /dev/null 2>&1; then ( ! grep "^I:.*:file.*not removed$" *.log ); fi - if git rev-parse > /dev/null 2>&1; then ( ! grep "^I:.*:file.*not removed$" *.log ); fi
after_script: after_script:
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
- test -d bind-* && cd bind-* - test -d bind-* && cd bind-*
- REALSOURCEDIR="$PWD"
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
- cat bin/tests/system/test-suite.log - cat bin/tests/system/test-suite.log
- (source bin/tests/system/conf.sh && "${PYTHON}" "${CI_PROJECT_DIR}/bin/tests/convert-trs-to-junit.py" . > "${CI_PROJECT_DIR}/junit.xml") - *find_python
- >
"$PYTHON" "$REALSOURCEDIR"/bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
.system_test: &system_test_job .system_test: &system_test_job
<<: *system_test_common <<: *system_test_common
@@ -330,8 +338,10 @@ stages:
<<: *system_test_common <<: *system_test_common
after_script: after_script:
- cat bin/tests/system/test-suite.log - cat bin/tests/system/test-suite.log
- find bin -name 'tsan.*' -exec python3 util/parse_tsan.py {} \; - *find_python
- (source bin/tests/system/conf.sh && "${PYTHON}" "${CI_PROJECT_DIR}/bin/tests/convert-trs-to-junit.py" . > "${CI_PROJECT_DIR}/junit.xml") - find bin -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \;
- >
"$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
artifacts: artifacts:
expire_in: "1 day" expire_in: "1 day"
untracked: true untracked: true
@@ -347,9 +357,12 @@ stages:
script: script:
- make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1 - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
after_script: after_script:
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
- test -d bind-* && cd bind-* - test -d bind-* && cd bind-*
- (source bin/tests/system/conf.sh && "${PYTHON}" "${CI_PROJECT_DIR}/bin/tests/convert-trs-to-junit.py" . > "${CI_PROJECT_DIR}/junit.xml") - REALSOURCEDIR="$PWD"
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
- *find_python
- >
"$PYTHON" "$REALSOURCEDIR"/bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
.unit_test: &unit_test_job .unit_test: &unit_test_job
<<: *unit_test_common <<: *unit_test_common
@@ -370,8 +383,10 @@ stages:
.unit_test_tsan: &unit_test_tsan_job .unit_test_tsan: &unit_test_tsan_job
<<: *unit_test_common <<: *unit_test_common
after_script: after_script:
- find lib -name 'tsan.*' -exec python3 util/parse_tsan.py {} \; - *find_python
- (source bin/tests/system/conf.sh && "${PYTHON}" "${CI_PROJECT_DIR}/bin/tests/convert-trs-to-junit.py" . > "${CI_PROJECT_DIR}/junit.xml") - find lib -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \;
- >
"$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml
artifacts: artifacts:
expire_in: "1 day" expire_in: "1 day"
paths: paths:

2
bin/tests/Makefile.am
View File

@@ -1,5 +1,7 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
EXTRA_DIST = convert-trs-to-junit.py
SUBDIRS = system SUBDIRS = system
noinst_PROGRAMS = \ noinst_PROGRAMS = \