From: Radosław Korzeniewski Date: Mon, 21 Oct 2019 15:35:29 +0000 (+0200) Subject: regress: Update unittests scripts. X-Git-Tag: Release-9.6.0~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=864fdc88012e3fa3d0f015d353ce21e6d7b2a176;p=thirdparty%2Fbacula.git regress: Update unittests scripts. --- diff --git a/regress/tests/alist-unittests b/regress/tests/alist-unittests index 4b5fc5349..2db22b70a 100755 --- a/regress/tests/alist-unittests +++ b/regress/tests/alist-unittests @@ -8,9 +8,5 @@ # # This is an alist unit test # -TestName="alist_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "alist_test" "src/lib" diff --git a/regress/tests/base64-unittests b/regress/tests/base64-unittests index 13d8d79c5..20b23e048 100755 --- a/regress/tests/base64-unittests +++ b/regress/tests/base64-unittests @@ -8,9 +8,5 @@ # # This is a base64 unit test # -TestName="base64_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "base64_test" "src/lib" diff --git a/regress/tests/bsnprintf-unittests b/regress/tests/bsnprintf-unittests index 2a6827a2e..bb95c6710 100755 --- a/regress/tests/bsnprintf-unittests +++ b/regress/tests/bsnprintf-unittests @@ -8,9 +8,5 @@ # # This is an bsnprintf unit test # -TestName="bsnprintf_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "bsnprintf_test" "src/lib" diff --git a/regress/tests/bsock-unittests b/regress/tests/bsock-unittests index c572c7296..558bc3caf 100755 --- a/regress/tests/bsock-unittests +++ b/regress/tests/bsock-unittests @@ -8,15 +8,11 @@ # # This is a BSOCK unit test # -TestName="bsock_test" NC="/bin/netcat" if [ -f $NC ] then -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "bsock_test" "src/lib" else echo "$0 requires $NC to complete" fi diff --git a/regress/tests/bsockcore-unittests b/regress/tests/bsockcore-unittests index 33e01c0de..28ba75c66 100755 --- a/regress/tests/bsockcore-unittests +++ b/regress/tests/bsockcore-unittests @@ -8,15 +8,11 @@ # # This is a BSOCKCORE unit test # -TestName="bsockcore_test" NC="/bin/netcat" if [ -f $NC ] then -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "bsockcore_test" "src/lib" else echo "$0 requires $NC to complete" fi diff --git a/regress/tests/collect-unittests b/regress/tests/collect-unittests index ef5692166..411b9d08c 100755 --- a/regress/tests/collect-unittests +++ b/regress/tests/collect-unittests @@ -3,15 +3,10 @@ # Copyright (C) 2000-2015 Kern Sibbald # License: BSD 2-Clause; see file LICENSE-FOSS # -# Radosław Korzeniewski, MMXVIII -# radoslaw@korzeniewski.net, radekk@inteos.pl -# Inteos Sp. z o.o. http://www.inteos.pl/ +# Copyright (c) 2018 by Inteos sp. z o.o. +# All rights reserved. IP transfered to Bacula Systems according to agreement. # -# This is an ConfigFile/ini unit test +# This is a collector unit test # -TestName="collect_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "collect_test" "src/lib" diff --git a/regress/tests/crc32-unittests b/regress/tests/crc32-unittests index d3430e0a6..18a5e8ee8 100755 --- a/regress/tests/crc32-unittests +++ b/regress/tests/crc32-unittests @@ -8,9 +8,5 @@ # # This is a crc32 unit test # -TestName="crc32_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "crc32_test" "src/lib" diff --git a/regress/tests/flist-unittests b/regress/tests/flist-unittests index e7861e04d..e6640b659 100755 --- a/regress/tests/flist-unittests +++ b/regress/tests/flist-unittests @@ -8,9 +8,5 @@ # # This is a flist unit test # -TestName="flist_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "flist_test" "src/lib" diff --git a/regress/tests/fnmatch-unittests b/regress/tests/fnmatch-unittests index 3c18d04e6..7da419c5b 100755 --- a/regress/tests/fnmatch-unittests +++ b/regress/tests/fnmatch-unittests @@ -8,9 +8,5 @@ # # This is a fnmatch unit test # -TestName="fnmatch_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "fnmatch_test" "src/lib" diff --git a/regress/tests/htable-unittests b/regress/tests/htable-unittests index 5e8f20549..569b3f925 100755 --- a/regress/tests/htable-unittests +++ b/regress/tests/htable-unittests @@ -8,9 +8,5 @@ # # This is a htable unit test # -TestName="htable_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "htable_test" "src/lib" diff --git a/regress/tests/ini-unittests b/regress/tests/ini-unittests index 0a6055b5d..db942692c 100755 --- a/regress/tests/ini-unittests +++ b/regress/tests/ini-unittests @@ -8,9 +8,5 @@ # # This is an ConfigFile/ini unit test # -TestName="ini_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "ini_test" "src/lib" diff --git a/regress/tests/lockmgr-unittests b/regress/tests/lockmgr-unittests index 042db7e68..1dab5fd95 100755 --- a/regress/tests/lockmgr-unittests +++ b/regress/tests/lockmgr-unittests @@ -8,9 +8,5 @@ # # This is a lockmgr unit test # -TestName="lockmgr_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "lockmgr_test" "src/lib" diff --git a/regress/tests/output-unittests b/regress/tests/output-unittests index c79aa4ead..21044e2d4 100755 --- a/regress/tests/output-unittests +++ b/regress/tests/output-unittests @@ -8,9 +8,5 @@ # # This is an output writer unit test # -TestName="output_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "output_test" "src/lib" diff --git a/regress/tests/sellist-unittests b/regress/tests/sellist-unittests index f0ae5e6a9..ee84a888c 100755 --- a/regress/tests/sellist-unittests +++ b/regress/tests/sellist-unittests @@ -8,9 +8,5 @@ # # This is a sellist unit test # -TestName="sellist_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "sellist_test" "src/lib" diff --git a/regress/tests/sha1-unittests b/regress/tests/sha1-unittests index 241477bb0..ccb9ef234 100755 --- a/regress/tests/sha1-unittests +++ b/regress/tests/sha1-unittests @@ -6,11 +6,7 @@ # Copyright (c) 2018 by Inteos sp. z o.o. # All rights reserved. IP transfered to Bacula Systems according to agreement. # -# This is a sellist unit test +# This is a sha1 unit test # -TestName="sha1_test" -. scripts/functions -make -C $src/src/lib $TestName - -$src/src/lib/$TestName -exit $? +. scripts/regress-utils.sh +do_regress_unittest "sha1_test" "src/lib"