regress: Update unittests scripts.

diff --git a/regress/tests/alist-unittests b/regress/tests/alist-unittests
index 4b5fc53496bb337658f2904e29e4f1fc3798a644..2db22b70a2435074b5a50f7b6689e27d10db8b3f 100755 (executable)
--- 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 13d8d79c51809062cf7bad6406a3abf98b728ccc..20b23e048f62c8686ffc3593696e626ba10e5165 100755 (executable)
--- 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 2a6827a2e1ebd68715bd7a3c1676e4380e05af73..bb95c67107b3e41c20893d1bb64f1b24baba3b9e 100755 (executable)
--- 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 c572c7296b5302c06918fd759ee20a314c6bf5b5..558bc3caf7a357b53031e67bc12531f4d0546e34 100755 (executable)
--- 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 33e01c0dec72008dbc31bddf361fff304c6f49bd..28ba75c663716b6d313b7cff5a0d03f9d5ce74e5 100755 (executable)
--- 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 ef5692166484d9b88e51e1bdbf6c5cd817113df4..411b9d08c7ee00eb5aa8011c2a56a3c57ff09ffb 100755 (executable)
--- 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 d3430e0a653526ec6d1e58a7ccd643b0e47dac25..18a5e8ee881f8f52429b8e0327c7f26a432a49f5 100755 (executable)
--- 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 e7861e04d46af3c9ec0d710b876fb7ad2bb89706..e6640b65950a05a664e00645f77d63233e29bcb8 100755 (executable)
--- 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 3c18d04e643bce75a4f05936645567d7137de0e2..7da419c5b034ff09ee7d22114566d8c622c471e9 100755 (executable)
--- 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 5e8f205496bfb8865389d5602d7f7efdf34c2ed7..569b3f925f4c8ea3ae81cc7201c11f2a3169f8e5 100755 (executable)
--- 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 0a6055b5d89d8f8cf9520f93d2fd6485e250e8d0..db942692c963904808a0a8fd1670697442304035 100755 (executable)
--- 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 042db7e68f58767338d3389399af1eb345baf74a..1dab5fd95288558bfe8e2c0c08e67d908e0be801 100755 (executable)
--- 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 c79aa4eadcebfddf448fffc7a4073b790afcb900..21044e2d4da95a0a7eed4cab78b1b2490d46f003 100755 (executable)
--- 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 f0ae5e6a9ca2beafcd7afd961324a55b3a7b2177..ee84a888c603df2f9f038250be7f08792e98748e 100755 (executable)
--- 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 241477bb0d57301ae4adc5698f953df1fc998d93..ccb9ef23410b213a526096579eaaf0c4695179bb 100755 (executable)
--- 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"