Commit 36649c49 authored by Evan Hunt's avatar Evan Hunt

Merge branch 'parallel-unit-tests' into 'master'

capture more info from unit tests, run in parallel

See merge request isc-projects/bind9!117
parents 91bfcb1a ef0b4c91
......@@ -21,9 +21,10 @@ ans.run
named.run
named.memstats
gen.dSYM/
.libs/
.ccache/
.deps/
.dirstamp
.libs/
unit/atf-src/atf-c++/atf-c++.pc
unit/atf-src/atf-c/atf-c.pc
unit/atf-src/atf-c/defs.h
......
......@@ -97,6 +97,7 @@ stages:
.system_test: &system_test_job
stage: test
before_script:
- rm -rf .ccache
- bash -x bin/tests/system/ifconfig.sh up
script:
- cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1
......@@ -107,10 +108,18 @@ stages:
.unit_test: &unit_test_job
stage: test
before_script:
- export KYUA_RESULT="$CI_PROJECT_DIR/kyua.results"
script:
- make unit
after_script:
- kyua report-html --force --results-file kyua.results --results-filter "" --output kyua_html
artifacts:
untracked: true
paths:
- atf.out
- kyua.log
- kyua.results
- kyua_html/
expire_in: '1 week'
when: on_failure
......
......@@ -18,7 +18,7 @@ atf_test_program{name='name_test'}
atf_test_program{name='nsec3_test'}
atf_test_program{name='peer_test'}
atf_test_program{name='private_test'}
atf_test_program{name='rbt_serialize_test'}
atf_test_program{name='rbt_serialize_test', is_exclusive=true}
atf_test_program{name='rbt_test'}
atf_test_program{name='rdata_test'}
atf_test_program{name='rdataset_test'}
......
......@@ -10,7 +10,7 @@ if [ -n "@UNITTESTS@" -a -x "$ATFRUN" -a -f Atffile ]
then
echo "S:unit:`date`"
echo "T:unit:1:A"
echo "I: unit tests"
echo "I: unit tests (using atf-run)"
atf-run > atf.out
status=$?
......@@ -29,11 +29,11 @@ elif [ -n "@UNITTESTS@" -a -x "$KYUA" -a -f Kyuafile ]
then
echo "S:unit:`date`"
echo "T:unit:1:A"
echo "I: unit tests"
kyua --logfile kyua.log test
echo "I: unit tests (using kyua)"
kyua -v parallelism=${TEST_PARALLEL_JOBS:-1} --logfile kyua.log --loglevel debug test --results-file ${KYUA_RESULT:-NEW}
status=$?
kyua report
kyua report --results-file ${KYUA_RESULT:-LATEST}
if [ $status -eq 0 ]
then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment