hyung-hwan/hcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed err.sh to produce the expected line upon failure.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
updated t/Makefile.am to use $(SHELL) intead of sh
This commit is contained in:
hyung-hwan 2024-02-05 22:23:38 +09:00
parent 4d5f2266b4
commit ded917711e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/Makefile.am
View File

@ -31,8 +31,8 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(check_ERRORS)
TEST_EXTENSIONS = .hcl .err TEST_EXTENSIONS = .hcl .err
HCL_LOG_COMPILER = sh $(abs_srcdir)/run.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n HCL_LOG_COMPILER = $(SHELL) $(abs_srcdir)/run.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n
AM_HCL_LOG_FLAGS = AM_HCL_LOG_FLAGS =
ERR_LOG_COMPILER = sh $(abs_srcdir)/err.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n ERR_LOG_COMPILER = $(SHELL) $(abs_srcdir)/err.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n
AM_ERR_LOG_FLAGS = AM_ERR_LOG_FLAGS =

4
t/Makefile.in
View File

@ -495,9 +495,9 @@ check_ERRORS = \
EXTRA_DIST = $(check_SCRIPTS) $(check_ERRORS) EXTRA_DIST = $(check_SCRIPTS) $(check_ERRORS)
TEST_EXTENSIONS = .hcl .err TEST_EXTENSIONS = .hcl .err
HCL_LOG_COMPILER = sh $(abs_srcdir)/run.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n HCL_LOG_COMPILER = $(SHELL) $(abs_srcdir)/run.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n
AM_HCL_LOG_FLAGS = AM_HCL_LOG_FLAGS =
ERR_LOG_COMPILER = sh $(abs_srcdir)/err.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n ERR_LOG_COMPILER = $(SHELL) $(abs_srcdir)/err.sh ../bin/hcl --modlibdirs="@abs_top_builddir@/mod:@abs_top_builddir@/mod/.libs" --heapsize=0 -b -n
AM_ERR_LOG_FLAGS = AM_ERR_LOG_FLAGS =
all: all-am all: all-am

6
t/err.sh
View File

@ -35,7 +35,7 @@ run_partfile() {
## the regular expression is not escaped properly. the error information must not ## the regular expression is not escaped properly. the error information must not
## include specifial regex characters to avoid problems. ## include specifial regex characters to avoid problems.
echo "$l_output" | grep -E "ERROR:.+${l_partfile}\[${l_expected_errline},[[:digit:]]+\] ${l_expected_errmsg}" >/dev/null 2>&1 || { echo "$l_output" | grep -E "ERROR:.+${l_partfile}\[${l_expected_errline},[[:digit:]]+\] ${l_expected_errmsg}" >/dev/null 2>&1 || {
echo "ERROR: error not raised - $l_script($l_partno) - $l_output" echo "ERROR: error not raised at line $l_expected_errline - $l_script($l_partno) - $l_output"
return 1 return 1
} }
@ -50,7 +50,8 @@ partno=0
partlines=0 partlines=0
> "$partfile" > "$partfile"
## TODO: don't use while read line.. ## dash behaves differently for read -r.
## while \n is read in literally by bash or other shells, dash converts it to a new-line
while IFS= read -r line while IFS= read -r line
do do
if [ "$line" = "---" ] if [ "$line" = "---" ]
@ -73,3 +74,4 @@ done < "$script"
rm -f "$partfile" rm -f "$partfile"
exit $ever_failed exit $ever_failed