@@ -98,6 +98,15 @@ fi if (( ${#_Dbg_script_args[@]} > 0 )) ; then _Dbg_script_file="${_Dbg_script_args[0]}" + case ${_Dbg_script_file:0:1} in + '.' | '/' ) + # Leave alone + ;; + * ) + # Make . explicit. + _Dbg_script_file="./${_Dbg_script_file}" + _Dbg_script_args[0]="$_Dbg_script_file" + esac # FIXME: # shift _Dbg_script_args elif [[ -z $_Dbg_EXECUTION_STRING ]] ; then kshdb.in @@ -9,10 +9,16 @@ test_examine() typeset -i _Dbg_logging_redirect=0 typeset _Dbg_tty='' typeset msg + typeset expect # Integer property variable typeset -i an_int=2 msg=$(_Dbg_do_examine an_int) - assertEquals 'typeset -i an_int=2' "$msg" + if ((.sh.version <= 20081210 )) ; then + expect='typeset -i an_int=2' + else + expect='an_int=2' + fi + assertEquals "$expect" "$msg" # String variable typeset str_var='ho' @@ -21,22 +27,34 @@ test_examine() # Exported string variable typeset -x exported_str_var='exported string' + if ((.sh.version <= 20081210 )) ; then + expect="typeset -x exported_str_var='exported string'" + else + expect="exported_str_var='exported string'" + fi msg=$(_Dbg_do_examine exported_str_var) - assertEquals "typeset -x exported_str_var='exported string'" "$msg" + assertEquals "$expect" "$msg" # Array variable typeset -a an_array=(1 2 3) + if ((.sh.version <= 20081210 )) ; then + expect='typeset -a an_array=(1 2 3)' + else + expect='an_array=(1 2 3)' + fi msg=$(_Dbg_do_examine an_array) - assertEquals 'typeset -a an_array=(1 2 3)' "$msg" + assertEquals "$expect" "$msg" - # Expression involving variables - msg=$(_Dbg_do_examine an_array[1]+_Dbg_logging+5) - assertEquals '7' "$msg" + if ((.sh.version <= 20081210 )) ; then + # Expression involving variables + msg=$(_Dbg_do_examine an_array[1]+_Dbg_logging+5) + assertEquals '7' "$msg" - # Expression involving variables - function a_function { :; } - msg=$(_Dbg_do_examine a_function) - assertEquals 'function a_function { :; }' "$msg" + # Expression involving variables + function a_function { :; } + msg=$(_Dbg_do_examine a_function) + assertEquals 'function a_function { :; }' "$msg" + fi } abs_top_srcdir=@abs_top_srcdir@ test/unit/test-examine.sh.in b894073163251733d18d05a2835b9db4c48070eb R. Bernstein rocky@gnu.org http://github.com/rocky/kshdb/commit/69a47a800dee729b4140438260ae7eca55b74606 69a47a800dee729b4140438260ae7eca55b74606 2009-06-12T19:15:55-07:00 2009-06-12T19:15:55-07:00 kshdb.in - add ./ to script name for where a path wasn't indicated test-examine.sh.in: newer ksh's seem to give different typeset output. ef58dc86227d7f43df15c241cce52152eb06d0ef R. Bernstein rocky@gnu.org