Make @use_lib apply also to @reached_if xonixx#76 : minor improvements

makesure.awk

@@ -515,7 +515,6 @@ function die(msg,    out) {
 }
 
 function checkConditionReached(goalName, definesLine, conditionStr,    script) {
-
   script = definesLine # need this to initialize variables for check conditions
   if (goalName in GoalToLib)
     script = script "\n" Lib[GoalToLib[goalName]]

tests/15_lib.sh

@@ -1,8 +1,9 @@
 
+@define HELLO="Hello"
 
 @lib
   f1 () {
-    echo "Hello $1"
+    echo "$HELLO $1"
   }
 
 @goal g1
@@ -18,7 +19,12 @@ f2 World
     echo "Hello lib_name $1"
   }
 
-@goal g5
+@goal g3
 @use_lib
 @reached_if [ "$(f1 World)" = "Hello World" ]
 echo "Should not see this"
+
+@goal g4
+@use_lib lib_name
+@reached_if [[ "$(f2 World)" == "123" ]]
+echo "Should see this"

tests/15_lib.tush

@@ -4,7 +4,8 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib.sh -l
 | Available goals:
 |   g1
 |   g2
-|   g5
+|   g3
+|   g4
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib.sh g1
 |   goal 'g1' ...
@@ -14,10 +15,14 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib.sh g2
 |   goal 'g2' ...
 | Hello lib_name World
 
+$ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib.sh g3
+|   goal 'g3' [already satisfied].
+
+$ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib.sh g4
+|   goal 'g4' ...
+| Should see this
+
 $ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib_unknown.sh g3
 @ Goal 'g3' uses unknown lib 'unknown':
 @ tests/15_lib_unknown.sh:3: @use_lib unknown
 ? 1
-
-$ cd "$MYDIR"; ./$MAKESURE -f tests/15_lib.sh g5
-|   goal 'g5' [already satisfied].