From c10a7b8bda6a887aaf7eae98412c77483f908841 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 29 Mar 2023 18:24:15 -0500 Subject: [PATCH] Regression: Build test.sh script is not properly running. Three mistakes are introduced by the commit 362c7b9f6cd57421a18c0148fb6eb9bda165bcd2. 1) The error handling return status checks are against empty string and not "0". 2) The test.sh script is backported from the 0.7.x development branch and accidentally included projects not existing in this 0.6.x branch. 3) Accidental copy and paste mistake where print variable is being used as if it were a function. Remove the failure=0 assignment. The default of failure="" is what is needed. The fl_path project is actually fll_path. The variable print_line_first is supposed to be test_print_first. --- build/scripts/test.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build/scripts/test.sh b/build/scripts/test.sh index f239128..81e855f 100644 --- a/build/scripts/test.sh +++ b/build/scripts/test.sh @@ -67,11 +67,9 @@ test_main() { local verbose= local verbose_common= - local projects="f_type f_status f_memory f_type_array f_string f_utf f_account f_capability f_color f_console f_control_group f_conversion f_directory f_environment f_execute f_file f_fss f_iki f_limit f_path f_pipe f_print f_serialize f_signal f_socket f_status_string f_thread fl_control_group fl_conversion fl_directory fl_environment fl_execute fl_fss fl_iki fl_path fl_print fl_signal fl_string fl_utf fl_utf_file fll_control_group fll_error fll_execute fll_file fll_fss fll_fss_status_string fll_iki fll_print fll_program fll_status_string" + local projects="f_type f_status f_memory f_type_array f_string f_utf f_account f_capability f_color f_console f_control_group f_conversion f_directory f_environment f_execute f_file f_fss f_iki f_limit f_path f_pipe f_print f_serialize f_signal f_socket f_status_string f_thread fl_control_group fl_conversion fl_directory fl_environment fl_execute fl_fss fl_iki fl_print fl_signal fl_string fl_utf fl_utf_file fll_control_group fll_error fll_execute fll_file fll_fss fll_fss_status_string fll_iki fll_path fll_print fll_program fll_status_string" local projects_no_tests="f_type" - let failure=0 - if [[ $# -gt 0 ]] ; then t=$# @@ -244,7 +242,7 @@ test_main() { if [[ $? -ne 0 ]] ; then if [[ $verbosity != "quiet" ]] ; then - print_line_first + test_print_first echo -e "${c_error}ERROR: The test path ${c_notice}${path_test}${c_error}, does not exist and could not be created or exists and is not a valid directory.${c_reset}" fi @@ -258,7 +256,7 @@ test_main() { if [[ $? -ne 0 ]] ; then if [[ $verbosity != "quiet" ]] ; then - print_line_first + test_print_first echo -e "${c_error}ERROR: The package path ${c_notice}${path_test_package}${c_error}, does not exist and could not be created or exists and is not a valid directory.${c_reset}" fi @@ -272,7 +270,7 @@ test_main() { if [[ $? -ne 0 ]] ; then if [[ $verbosity != "quiet" ]] ; then - print_line_first + test_print_first echo -e "${c_error}ERROR: The test project path ${c_notice}${path_test_project}${c_error}, does not exist and could not be created or exists and is not a valid directory.${c_reset}" fi @@ -286,7 +284,7 @@ test_main() { if [[ $? -ne 0 ]] ; then if [[ $verbosity != "quiet" ]] ; then - print_line_first + test_print_first echo -e "${c_error}ERROR: The test work path ${c_notice}${path_test_work}${c_error}, does not exist and could not be created or exists and is not a valid directory.${c_reset}" fi -- 1.8.3.1