From 5f8c46d559d106d3b6dc82b1335d819e80204fe9 Mon Sep 17 00:00:00 2001 From: xonix Date: Fri, 5 Jan 2024 17:32:54 +0200 Subject: [PATCH] Allow `@glob` goals to be parameterized #155 --- makesure.awk | 2 +- tests/12_errors.tush | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/makesure.awk b/makesure.awk index 7c9e58b..0d75b8a 100755 --- a/makesure.awk +++ b/makesure.awk @@ -250,7 +250,7 @@ function handleGoalGlob( goalName,globAllGoal,globSingle,priv,i,pattern,nfMax, } else pattern = $(nfMax = 4) if (NF > nfMax && "@params" != $(nfMax + 1)) - addError("nothing allowed after glob pattern") # TODO adjust error + addError("nothing or @params allowed after glob pattern") else if (pattern == "") addError("absent glob pattern") else { diff --git a/tests/12_errors.tush b/tests/12_errors.tush index 30071cd..4dbe975 100644 --- a/tests/12_errors.tush +++ b/tests/12_errors.tush @@ -42,11 +42,11 @@ $ ./$MAKESURE -f tests/12_errors.sh @ tests/12_errors.sh:48: @goal @private @ nothing allowed after goal name: @ tests/12_errors.sh:51: @goal g15 should not have anything after goal name -@ nothing allowed after glob pattern: +@ nothing or @params allowed after glob pattern: @ tests/12_errors.sh:54: @goal g17 @glob '*.txt' should not have anything after glob pattern -@ nothing allowed after glob pattern: +@ nothing or @params allowed after glob pattern: @ tests/12_errors.sh:57: @goal @glob '*.txt' should not have anything after glob pattern -@ nothing allowed after glob pattern: +@ nothing or @params allowed after glob pattern: @ tests/12_errors.sh:58: @goal @glob '*.txt' should_not_have_anything_after_glob_pattern @ absent glob pattern: @ tests/12_errors.sh:61: @goal @glob # absent glob pattern