pass arguments to _gsh_check function

Author: phyver

lib/gsh.sh

@@ -376,7 +376,7 @@ _gsh_check() {
 
   local MISSION_DIR="$(missiondir "$MISSION_NB")"
 
-  mission_source "$MISSION_DIR/check.sh"
+  mission_source "$MISSION_DIR/check.sh" "$@"
   local exit_status=$?
 
   if [ "$exit_status" -eq 0 ]
@@ -557,16 +557,16 @@ _gsh_assert_check() {
   local MISSION_NB="$(_gsh_pcm)"
 
   local expected=$1
+  shift
   if [ "$expected" != "true" ] && [ "$expected" != "false" ]
   then
     echo "$(eval_gettext "Error: _gsh_assert_check only accept 'true' and 'false' as argument.")" >&2
     return 1
   fi
-  local msg=$3
 
   local MISSION_DIR="$(missiondir "$MISSION_NB")"
 
-  mission_source "$MISSION_DIR/check.sh"
+  mission_source "$MISSION_DIR/check.sh" "$@"
   local exit_status=$?
 
   local nb_tests=$(cat "$GSH_TMP/nb_tests")
@@ -579,13 +579,11 @@ _gsh_assert_check() {
     nb_failed_tests=$((nb_failed_tests+1))
     echo "$nb_failed_tests" > "$GSH_TMP/nb_failed_tests"
     color_echo red "$(eval_gettext 'test $nb_tests failed') (expected check 'true')"
-    [ -n "$msg" ] && echo "$msg"
   elif [ "$expected" = "false" ] && [ "$exit_status" -eq 0 ]
   then
     nb_failed_tests=$((nb_failed_tests+1))
     echo "$nb_failed_tests" > "$GSH_TMP/nb_failed_tests"
     color_echo red "$(eval_gettext 'test $nb_tests failed') (expected check 'false')"
-    [ -n "$msg" ] && echo "$msg"
   fi
 
   export GSH_LAST_ACTION="assert"
@@ -596,13 +594,12 @@ _gsh_assert_check() {
 
 _gsh_assert() {
   local condition=$1
+  shift
   if [ "$condition" = "check" ]
   then
-    shift
     _gsh_assert_check "$@"
     return
   fi
-  local msg=$2
 
   local nb_tests=$(cat "$GSH_TMP/nb_tests")
   echo "$(( nb_tests + 1))" > "$GSH_TMP/nb_tests"
@@ -611,7 +608,6 @@ _gsh_assert() {
   then
     echo "$(( nb_failed_tests + 1))" > "$GSH_TMP/nb_failed_tests"
     color_echo red "$(eval_gettext 'test $nb_tests failed') (expected condition 'true')"
-    [ -n "$msg" ] && echo "$msg"
   fi
 }
 
@@ -695,7 +691,7 @@ gsh() {
   local ret=0
   case $cmd in
     "check")
-      _gsh_check
+      _gsh_check "$@"
       ret=$?
       ;;
     "reset")

lib/mission_source.sh

@@ -18,6 +18,7 @@
 mission_source() {
   local FILENAME
   FILENAME=$1
+  shift         # keep the rest of the arguments to pass to the sourced file
 
   if ! [ -e "$FILENAME" ]
   then
@@ -41,7 +42,7 @@ mission_source() {
   # if we are not running in DEBUG mode, just source the file
   if [ "$GSH_MODE" != "DEBUG" ] || [ -z "$GSH_VERBOSE_DEBUG" ]
   then
-    local _MISSION_DIR _TEXTDOMAIN _MISSION_NAME _PATH exit_status
+    local _MISSION_DIR _TEXTDOMAIN _MISSION_NAME _PATH _SAVED_ARGS exit_status
     export MISSION_DIR TEXTDOMAIN MISSION_NAME
     _MISSION_DIR=$MISSION_DIR
     MISSION_DIR=$(dirname "$(readlink-f "$FILENAME")")
@@ -51,8 +52,11 @@ mission_source() {
     MISSION_NAME=${FILENAME#$GSH_MISSIONS/}
     _PATH=$PATH
     PATH=$PATH:$GSH_SBIN
+    _SAVED_ARGS="$@"
+    set -- "$@"     # set $1 etc.
     . "$FILENAME"
     exit_status=$?
+    set -- $_SAVED_ARGS
     TEXTDOMAIN=$_TEXTDOMAIN
     MISSION_NAME=$_MISSION_NAME
     MISSION_DIR=$_MISSION_DIR
@@ -61,7 +65,7 @@ mission_source() {
     return $exit_status
   fi
 
-  local _MISSION_DIR _TEXTDOMAIN _MISSION_NAME _PATH exit_status env_before env_after
+  local _MISSION_DIR _TEXTDOMAIN _MISSION_NAME _PATH _SAVED_ARGS exit_status env_before env_after
   export MISSION_DIR TEXTDOMAIN MISSION_NAME
   echo "    GSH: sourcing \$GSH_ROOT/${FILENAME#$GSH_ROOT/}" >&2
   _MISSION_DIR=""  # otherwise, it appears in the environment!
@@ -84,8 +88,11 @@ mission_source() {
   MISSION_NAME=${FILENAME#$GSH_MISSIONS/}
   _PATH=$PATH
   PATH=$PATH:$GSH_SBIN
+  _SAVED_ARGS="$@"
+  set -- "$@"     # set $1 etc.
   . "$FILENAME"
   exit_status=$?
+  set -- $_SAVED_ARGS
   TEXTDOMAIN=$_TEXTDOMAIN
   MISSION_NAME=$_MISSION_NAME
   MISSION_DIR=$_MISSION_DIR

missions/basic/01_cd_tower/test.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env sh
 
-gsh assert_check false
+gsh assert check false
 
 cd ..
-gsh assert_check false
+gsh assert check false
 
 cd
-gsh assert_check false
+gsh assert check false
 
 cd "$(eval_gettext "\$GSH_HOME/Castle/Main_tower/First_floor/Second_floor/Top_of_the_tower")"
-gsh assert_check true
+gsh assert check true
 
 cd "$(eval_gettext "\$GSH_HOME/Castle/Main_tower/First_floor/Second_floor/Top_of_the_tower")/.."
-gsh assert_check false
+gsh assert check false

missions/basic/02_cd.._cellar/test.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env sh
 
 cd
-gsh assert_check false
+gsh assert check false
 
 cd "$(eval_gettext "\$GSH_HOME/Castle/Cellar")"
-gsh assert_check true
+gsh assert check true
 
 cd "$(eval_gettext "\$GSH_HOME/Castle/Cellar")/.."
-gsh assert_check false
+gsh assert check false
 
 cd
-gsh assert_check false
+gsh assert check false
 
 

missions/processes/03_pstree_kill/test.sh

@@ -24,19 +24,19 @@ stand_by
 kill_imp_spell
 sleep 1
 rm -f "$cellar"/*_"$(gettext "coal")"
-gsh assert_check true
+gsh assert check true
 
 stand_by
 kill_imp_spell
 sleep 1
-gsh assert_check false
+gsh assert check false
 
 stand_by
 kill_imp_spell
 sleep 1
 rm -f "$cellar"/*_"$(gettext "coal")"
 rm -f "$cellar"/*_"$(gettext "snowflake")"
-gsh assert_check false
+gsh assert check false
 
 
 unset -f kill_imp_spell