diff --git a/doc/docbook.sh b/doc/docbook.sh index 83bbf54..d3ca1cd 100755 --- a/doc/docbook.sh +++ b/doc/docbook.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2012-2020 Pierre Pronchery +#Copyright (c) 2012-2021 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -34,7 +34,7 @@ FOP="fop" INSTALL="install -m 0644" MKDIR="mkdir -m 0755 -p" RM="rm -f" -XMLLINT="xmllint" +XMLLINT="xmllint --nonet --xinclude" XSLTPROC="xsltproc --nonet --xinclude" [ -f "$CONFIGSH" ] && . "$CONFIGSH" diff --git a/tests/clint.sh b/tests/clint.sh index a7d22ba..04727c6 100755 --- a/tests/clint.sh +++ b/tests/clint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2016-2020 Pierre Pronchery +#Copyright (c) 2016-2021 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -33,6 +33,7 @@ PROJECTCONF="../project.conf" #executables DATE="date" DEBUG="_debug" +ECHO="/bin/echo" FIND="find" GREP="grep" LINT="lint -g" @@ -68,41 +69,52 @@ _clint() fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue - for filename in $($FIND "../$subdir" -type f | $SORT); do + while read filename; do + [ -n "$filename" ] || continue + r=0 case "$filename" in *.c) echo - (_clint_lint "$filename"; - _clint_rtrim "$filename") + _clint_lint "$filename" || r=$? + _clint_rtrim "$filename"|| r=$? ;; *.h) echo echo "$filename:" - (_clint_rtrim "$filename") + _clint_rtrim "$filename"|| r=$? ;; *) continue ;; esac - if [ $? -ne 0 ]; then + if [ $r -eq 0 ]; then + echo " OK" + echo "$PROGNAME: $filename: OK" 1>&2 + else echo "FAIL" echo "$PROGNAME: $filename: FAIL" 1>&2 res=2 - else - echo "OK" fi - done + done << EOF +$($FIND "../$subdir" -type f | $SORT) +EOF done return $res } _clint_lint() -{ +{( filename="$1" - echo -n "${filename%/*}/" + $ECHO -n "${filename%/*}/" $DEBUG $LINT $CPPFLAGS $CFLAGS "$filename" 2>&1 -} + ret=$? + if [ $ret -eq 127 ]; then + #XXX ignore errors when $LINT is not available + ret=0 + fi + return $ret +)} _clint_rtrim() { @@ -118,10 +130,6 @@ _debug() { echo "$@" 1>&3 "$@" - res=$? - #ignore errors when the command is not available - [ $res -eq 127 ] && return 0 - return $res } diff --git a/tests/fixme.sh b/tests/fixme.sh index 84319cf..14316a5 100755 --- a/tests/fixme.sh +++ b/tests/fixme.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2017-2020 Pierre Pronchery +#Copyright (c) 2017-2022 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -95,7 +95,7 @@ _fixme_callback() echo "_fixme_callback_asm" return 0 ;; - c|cc|cpp|cxx|h|js|v) + c|cc|cpp|cxx|go|h|js|v) echo "_fixme_callback_c" return 0 ;; @@ -199,10 +199,6 @@ _debug() { echo "$@" 1>&3 "$@" - res=$? - #ignore errors when the command is not available - [ $res -eq 127 ] && return 0 - return $res } diff --git a/tests/pylint.sh b/tests/pylint.sh index 6c5b99b..7ce4f6e 100755 --- a/tests/pylint.sh +++ b/tests/pylint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2014-2020 Pierre Pronchery +#Copyright (c) 2014-2021 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -31,9 +31,10 @@ PROJECTCONF="../project.conf" #executables DATE="date" DEBUG="_debug" +ECHO="/bin/echo" FIND="find" MKDIR="mkdir -p" -PYLINT="pep8" +PYLINT="flake8" SORT="sort -n" TR="tr" @@ -65,17 +66,22 @@ _pylint() fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue - for filename in $($FIND "../$subdir" -type f -a -name '*.py' | $SORT); do + while read filename; do + [ -n "$filename" ] || continue echo - echo "Testing: $filename" + $ECHO -n "$filename:" $DEBUG $PYLINT -- "$filename" 2>&1 if [ $? -eq 0 ]; then + echo " OK" echo "$PROGNAME: $filename: OK" 1>&2 else #XXX ignore errors + echo "FAIL" echo "$PROGNAME: $filename: FAIL" 1>&2 fi - done + done << EOF +$($FIND "../$subdir" -type f -a -iname '*.py' | $SORT) +EOF done return $res } @@ -86,10 +92,6 @@ _debug() { echo "$@" 1>&3 "$@" - res=$? - #ignore errors when the command is not available - [ $res -eq 127 ] && return 0 - return $res } diff --git a/tests/shlint.sh b/tests/shlint.sh index 586d237..bf88560 100755 --- a/tests/shlint.sh +++ b/tests/shlint.sh @@ -1,6 +1,6 @@ #!/bin/sh #$Id$ -#Copyright (c) 2014-2020 Pierre Pronchery +#Copyright (c) 2014-2021 Pierre Pronchery # #Redistribution and use in source and binary forms, with or without #modification, are permitted provided that the following conditions are met: @@ -31,6 +31,7 @@ PROJECTCONF="../project.conf" #executables DATE="date" DEBUG="_debug" +ECHO="/bin/echo" FIND="find" MKDIR="mkdir -p" SHLINT="sh -n" @@ -48,7 +49,6 @@ _shlint() subdirs= $DATE - echo while read line; do case "$line" in "["*) @@ -66,15 +66,22 @@ _shlint() fi for subdir in $subdirs; do [ -d "../$subdir" ] || continue - for filename in $($FIND "../$subdir" -type f -a -name '*.sh' | $SORT); do + while read filename; do + [ -n "$filename" ] || continue + echo + $ECHO -n "$filename:" _shlint_file "$filename" if [ $? -eq 0 ]; then - echo "$filename:" + echo " OK" + echo "$PROGNAME: $filename: OK" 1>&2 else + echo "FAIL" echo "$PROGNAME: $filename: FAIL" 1>&2 res=2 fi - done + done << EOF +$($FIND "../$subdir" -type f -a -iname '*.sh' | $SORT) +EOF done return $res } @@ -107,10 +114,6 @@ _debug() { echo "$@" 1>&3 "$@" - res=$? - #ignore errors when the command is not available - [ $res -eq 127 ] && return 0 - return $res }