ts: enclose variable value within single quote for shells

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

testsuite/config/base-config.exp

@@ -224,16 +224,22 @@ proc shell_text {test_shell val {re_mode 0}} {
     return $answer
 }
 
-proc shell_val {test_shell val {re_mode 0}} {
+proc shell_val {test_shell val {re_mode 0} {alias_val 0}} {
     if {$val ne "(.*)"} {
+        if {$alias_val && $test_shell in {sh bash ksh zsh fish}} {
+            set test_shell a-$test_shell
+        }
         switch -- $test_shell {
-            {sh} - {bash} - {ksh} - {zsh} - {csh} - {tcsh} - {fish} {
+            {a-sh} - {a-bash} - {csh} - {tcsh} - {a-ksh} - {a-zsh} - {a-fish} {
                 set val [regsub -all {([\\"'$|<>{}`*? ()!&;\[\]])} $val {\\\1}]
             }
             {lisp} - {cmake} {
                 set val [regsub -all {(["])} $val {\\\1}]
             }
-            {perl} - {python} - {ruby} {
+            {sh} - {bash} - {ksh} - {zsh} {
+                set val [string map {' '\\''} $val]
+            }
+            {fish} - {perl} - {python} - {ruby} {
                 set val [regsub -all {(['])} $val {\\\1}]
             }
             {r} {
@@ -263,16 +269,16 @@ proc shell_set {test_shell var val {re_mode 0} {escval 1}} {
 
     switch -- $test_shell {
         {sh} - {bash} - {ksh} - {zsh} {
-            set answer "$var=$val; export $var;"
+            set answer "$var='$val'; export $var;"
         }
         {csh} - {tcsh} {
             set answer "setenv $var $val;"
         }
         {fish} {
             if {$var eq "PATH"} {
-                regsub -all ":" $val " " val
+                set val [join [split $val :] {' '}]
             }
-            set answer "set -xg $var $val;"
+            set answer "set -xg $var '$val';"
         }
         {tcl} {
             set answer "set ::env${esc}($var${esc}) ${esc}{$val${esc}};"
@@ -364,7 +370,7 @@ proc shell_unset {test_shell var {re_mode 0}} {
 
 proc shell_alias {test_shell var val {re_mode 0} {escval 1}} {
     if {$escval} {
-        set val [shell_val $test_shell $val $re_mode]
+        set val [shell_val $test_shell $val $re_mode 1]
     }
 
     switch -- $test_shell {

testsuite/modules.50-cmds/022-setenv-eschars.exp

@@ -39,9 +39,17 @@ set modulefile "$modpath/$module"
 #  For the different shells ...
 #
 
-lappend ans [list set pathelogical "abc\\ :\\	\\{\\}\\|\\<\\>\\!\\#\\$\\^\\&\\'\\\"\\(\\)@x%y\\\\z:sh\\*" noescval]
-lappend ans [list set _LMFILES_ $modulefile]
-lappend ans [list set LOADEDMODULES $module]
+lappend ans_csh [list set pathelogical "abc\\ :\\	\\{\\}\\|\\<\\>\\!\\#\\$\\^\\&\\'\\\"\\(\\)@x%y\\\\z:sh\\*" noescval]
+lappend ans_csh [list set _LMFILES_ $modulefile]
+lappend ans_csh [list set LOADEDMODULES $module]
+
+lappend ans_sh [list set pathelogical "abc :	{}|<>!#$^&'\\''\"()@x%y\\z:sh*" noescval]
+lappend ans_sh [list set _LMFILES_ $modulefile]
+lappend ans_sh [list set LOADEDMODULES $module]
+
+lappend ans_fish [list set pathelogical "abc :	{}|<>!#$^&\\'\"()@x%y\\z:sh*" noescval]
+lappend ans_fish [list set _LMFILES_ $modulefile]
+lappend ans_fish [list set LOADEDMODULES $module]
 
 lappend ans2 [list set pathelogical "abc :	{}|<>!#$^&'\"()@x%y\\z:sh*"]
 lappend ans2 [list set _LMFILES_ $modulefile]
@@ -56,12 +64,22 @@ lappend ans_pwsh [list set LOADEDMODULES $module]
 #
 
 foreach sh $supported_shells {
-    if {[lsearch -exact $real_shells $sh] >= 0} {
-        test_cmd "$sh" "load $module" $ans
-    } elseif {$sh == "pwsh"} {
-        test_cmd "$sh" "load $module" $ans_pwsh
-    } else {
-        test_cmd "$sh" "load $module" $ans2
+    switch -- $sh {
+        sh - bash - ksh - zsh {
+            test_cmd $sh "load $module" $ans_sh
+        }
+        fish {
+            test_cmd $sh "load $module" $ans_fish
+        }
+        csh - tcsh {
+            test_cmd $sh "load $module" $ans_csh
+        }
+        pwsh {
+            test_cmd $sh "load $module" $ans_pwsh
+        }
+        default {
+            test_cmd $sh "load $module" $ans2
+        }
     }
 }
 

testsuite/modules.50-cmds/593-abort_on_error-misc.exp

@@ -71,8 +71,8 @@ testouterr_cmd bash {restore testsuite/home/coll-error-on-load} $ans_continue $t
 
 # mod-to-sh command (abort_on_error has an impact)
 set ts_mod_to_sh_continue "all-pre-out
-TSPATH=dir1; export TSPATH;
-TS=ok; export TS;
+TSPATH='dir1'; export TSPATH;
+TS='ok'; export TS;
 alias alall=value;
 funcall () { value; };
 cd '/tmp';