From 0d86ece5bf07a6571391c0f5514e61c550e31080 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 4 Nov 2020 18:39:57 +0100 Subject: [PATCH] Import the latest version from DeforaOS configure --- tests/fixme.sh | 108 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 31 deletions(-) diff --git a/tests/fixme.sh b/tests/fixme.sh index 1db1787..f530606 100755 --- a/tests/fixme.sh +++ b/tests/fixme.sh @@ -27,11 +27,14 @@ #variables PROGNAME="fixme.sh" PROJECTCONF="../project.conf" +REGEXP_ERROR="FIXME" +REGEXP_WARNING="\\(TODO\|XXX\\)" #executables DATE="date" DEBUG="_debug" FIND="find" GREP="grep" +HEAD="head" MKDIR="mkdir -p" SORT="sort -n" TR="tr" @@ -64,24 +67,7 @@ _fixme() for subdir in $subdirs; do [ -d "../$subdir" ] || continue for filename in $($FIND "../$subdir" -type f | $SORT); do - callback= - ext=${filename##*/} - ext=${ext%.in} - ext=${ext##*.} - case "$ext" in - asm|S) - callback="_fixme_asm" - ;; - c|cc|cpp|cxx|h|js) - callback="_fixme_c" - ;; - conf|sh) - callback="_fixme_sh" - ;; - htm|html|xml) - callback="_fixme_xml" - ;; - esac + callback=$(_fixme_callback "$filename") [ -n "$callback" ] || continue ($callback "$filename") 2>&1 if [ $? -ne 0 ]; then @@ -93,54 +79,114 @@ _fixme() return $res } -_fixme_asm() +_fixme_callback() +{ + filename="$1" + ext=${filename##*/} + ext=${ext%.in} + ext=${ext##*.} + callback= + + case "$ext" in + asm|S) + echo "_fixme_callback_asm" + return 0 + ;; + c|cc|cpp|cxx|h|js) + echo "_fixme_callback_c" + return 0 + ;; + conf|sh) + echo "_fixme_callback_sh" + return 0 + ;; + py) + echo "_fixme_callback_python" + return 0 + ;; + htm|html|xml|xsl) + echo "_fixme_callback_xml" + return 0 + ;; + esac + case $($HEAD -n 1 "$filename") in + "#!/bin/sh"|"#! /bin/sh" + |"#!/usr/bin/env bash"|"#! /usr/bin/env bash") + echo "_fixme_callback_sh" + return 0 + ;; + "#!/usr/bin/env python"*|"#! /usr/bin/env python"*) + echo "_fixme_callback_python" + return 0 + ;; + "