Consider adding --dry-run option #29 : issues with --resolved : i…

…mpl + fix other tests
xonixx · Feb 9, 2022 · 885ca40 · 885ca40
1 parent 5a1d782
commit 885ca40
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/makesure.awk b/makesure.awk
@@ -434,7 +434,8 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
         printf " %s", quote2(ArgGoals[i],1)
       print ":"
       for (i = 0; i in resolvedGoals; i++)
-        print "  " quote2(resolvedGoals[i])
+        if (!reachedGoals[goalName=resolvedGoals[i]])
+          print "  " quote2(goalName)
     } else {
       for (i = 0; i in resolvedGoals; i++) {
         goalName = resolvedGoals[i]

diff --git a/tests/10_define.tush b/tests/10_define.tush
@@ -64,8 +64,6 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/10_define.sh is_not_reached
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/10_define.sh children_reached_or_not -d
 | Resolved goals to reach for 'children_reached_or_not':
-|   must_be_reached1
-|   must_be_reached2
 |   other_goal_2
 |   is_not_reached
 |   children_reached_or_not

diff --git a/tests/11_goal_glob.tush b/tests/11_goal_glob.tush
@@ -26,7 +26,6 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/11_goal_glob.sh -la
 $ cd "$MYDIR"; ./$MAKESURE -f tests/11_goal_glob.sh -d '11_goal_glob*.txt'
 | Resolved goals to reach for '11_goal_glob*.txt':
 |   11_goal_glob_1.txt
-|   11_goal_glob_2.txt
 |   11_goal_glob_3.txt
 |   11_goal_glob_10.txt
 |   '11_goal_glob*.txt'

diff --git a/tests/6_reached_if.tush b/tests/6_reached_if.tush
@@ -7,10 +7,8 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/6_reached_if.sh
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/6_reached_if.sh -d
 | Resolved goals to reach for 'default':
-|   bbb
 |   aaa
 |   default
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/6_reached_if.sh --resolved bbb
 | Resolved goals to reach for 'bbb':
-|   bbb