Schedule resource depletion tpkg's sequentually

This commit is contained in:
Willem Toorop 2017-05-10 23:01:57 +02:00
parent b2d09e0171
commit 760b813333
4 changed files with 34 additions and 18 deletions

View File

@ -17,4 +17,4 @@ addons:
script: script:
- mkdir tests - mkdir tests
- cd tests - cd tests
- ../src/test/tpkg/run-all.sh - ../src/test/tpkg/run-parallel.sh

View File

@ -3,7 +3,7 @@ Version: 1.0
Description: Test if outstanding queries setting is obeyed Description: Test if outstanding queries setting is obeyed
CreationDate: Tue Mar 14 10:43:45 CET 2017 CreationDate: Tue Mar 14 10:43:45 CET 2017
Maintainer: Willem Toorop Maintainer: Willem Toorop
Category: Category: Resource depletion
Component: Component:
CmdDepends: CmdDepends:
Depends: 210-stub-only-link.tpkg Depends: 210-stub-only-link.tpkg

View File

@ -3,7 +3,7 @@ Version: 1.0
Description: Test if outstanding queries setting is obeyed Description: Test if outstanding queries setting is obeyed
CreationDate: ma 20 mrt 2017 15:17:45 CET CreationDate: ma 20 mrt 2017 15:17:45 CET
Maintainer: Willem Toorop Maintainer: Willem Toorop
Category: Category: Resource depletion
Component: Component:
CmdDepends: CmdDepends:
Depends: 210-stub-only-link.tpkg Depends: 210-stub-only-link.tpkg

View File

@ -11,29 +11,45 @@ retry:
MAKEFILE_HEADER MAKEFILE_HEADER
# Resource depletion tests should be performed one-by-one after all
# other tests have been done.
#
RD_TESTS=""
OTHERS=""
ALL="results:" ALL="results:"
for TEST_PKG in ${SRCDIR}/*.tpkg for TEST_PKG in `echo ${SRCDIR}/*.tpkg | xargs -n1 echo | sort`
do do
P=${TEST_PKG#${SRCDIR}/} P="${TEST_PKG#${SRCDIR}/}"
P=${P%.tpkg} P="${P%.tpkg}"
DONE="result.$P" R="result.${P}"
ALL="$ALL $DONE" ALL="${ALL} ${R}"
if grep -q 'Category:.*Resource depletion' "${TEST_PKG}/${P}.dsc"
then
RD_TESTS="${R} ${RD_TESTS}"
else
OTHERS="${OTHERS} ${R}"
fi
done done
echo $ALL >> Makefile echo "${ALL}" >> Makefile
printf '\t"%s" r\n\n' "${TPKG}" >> Makefile printf '\t"%s" r\n\n' "${TPKG}" >> Makefile
printf 'clean:\n\t"%s" clean\n\trm -fr build build-stub-only build-event-loops build-static-analysis install scan-build-reports .tpkg.var.master *.info\n\n' "${TPKG}" >> Makefile printf 'clean:\n\t"%s" clean\n\trm -fr build build-stub-only build-event-loops build-static-analysis install scan-build-reports .tpkg.var.master *.info\n\n' "${TPKG}" >> Makefile
for TEST_PKG in ${SRCDIR}/*.tpkg for P in ${OTHERS}
do do
P=${TEST_PKG#${SRCDIR}/} P="${P#result.}"
P=${P%.tpkg} TEST_PKG="${SRCDIR}/${P}.tpkg"
DONE="result.$P:" DEPS="result.${P}:"
for D in `grep "^Depends: " "${TEST_PKG}/${P}.dsc" | sed 's/^Depends: //g'` for D in `grep "^Depends: " "${TEST_PKG}/${P}.dsc" | sed 's/^Depends: //g'`
do do
D=${D%.tpkg} D="${D%.tpkg}"
DONE="$DONE result.$D" DEPS="${DEPS} result.${D}"
done done
echo $DONE >> Makefile echo "${DEPS}" >> Makefile
printf '\t"%s" %s exe "%s"\n\n' "${TPKG}" "$*" "${TEST_PKG}" >> Makefile printf '\t"%s" %s exe "%s"\n\n' "${TPKG}" "$*" "${TEST_PKG}" >> Makefile
echo "" >> Makefile
done done
make -j 2 for RD in ${RD_TESTS}
do
RD_TESTS="${RD_TESTS#$RD }"
TEST_PKG="${RD#result.}"
printf '%s: %s %s\n\t"%s" %s exe "%s/%s.tpkg"\n\n' "${RD}" "${OTHERS}" "${RD_TESTS}" "${TPKG}" "$*" "${SRCDIR}" "${TEST_PKG}" >> Makefile
done
#make -j 2