ts: update restore tests now extra tags are cleared

Author: xdelaruelle

testsuite/modules.61-coll/040-restore.exp

@@ -997,8 +997,8 @@ set ans [list]
 lappend ans [list set __MODULES_LMPREREQ $c37mod2&[email protected]\ bar=val1]
 lappend ans [list set _LMFILES_ $c37lmf]
 lappend ans [list set LOADEDMODULES $c37lm]
-lappend ans [list set __MODULES_LMEXTRATAG $c37mod2&[join $c37mod2extratag &]]
-lappend ans [list set __MODULES_LMTAG $c37mod1&auto-loaded:$c37mod2&[join $c37mod2tag &]]
+lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
+lappend ans [list set __MODULES_LMTAG $c37mod1&auto-loaded&foo:$c37mod2&[join $c37mod2tag &]]
 set tserr [msg_load tag/8.0]
 testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
 
@@ -1009,8 +1009,8 @@ lappend ans [list set __MODULES_LMVARIANT $c37lmvr]
 lappend ans [list set __MODULES_LMPREREQ $c37mod2&[email protected]\ bar=val1]
 lappend ans [list set _LMFILES_ $c37lmf]
 lappend ans [list set LOADEDMODULES $c37lm]
-lappend ans [list set __MODULES_LMEXTRATAG $c37mod1&foo:$c37mod2&[join $c37mod2extratag &]]
-lappend ans [list set __MODULES_LMTAG $c37mod1&foo&auto-loaded:$c37mod2&[join $c37mod2tag &]]
+lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
+lappend ans [list set __MODULES_LMTAG $c37lmtag]
 set tserr [msg_unload variant/3.0{bar=val1}]\n[msg_load variant/3.0{bar=val1}]\n[msg_load tag/8.0]
 testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
 
@@ -1021,8 +1021,8 @@ lappend ans [list set __MODULES_LMVARIANT $c37lmvr]
 lappend ans [list set __MODULES_LMPREREQ $c37mod2&[email protected]\ bar=val1]
 lappend ans [list set _LMFILES_ $c37lmf]
 lappend ans [list set LOADEDMODULES $c37lm]
-lappend ans [list set __MODULES_LMEXTRATAG $c37mod1&bar&foo:$c37mod2&[join $c37mod2extratag &]]
-lappend ans [list set __MODULES_LMTAG $c37mod1&bar&foo&auto-loaded:$c37mod2&[join $c37mod2tag &]]
+lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
+lappend ans [list set __MODULES_LMTAG $c37lmtag]
 set tserr [msg_unload variant/3.0{bar=val1}]\n[msg_load variant/3.0{bar=val1}]\n[msg_load tag/8.0]
 testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
 
@@ -1032,8 +1032,8 @@ set ans [list]
 lappend ans [list set __MODULES_LMPREREQ $c37mod2&[email protected]\ bar=val1]
 lappend ans [list set _LMFILES_ $c37lmf]
 lappend ans [list set LOADEDMODULES $c37lm]
-lappend ans [list set __MODULES_LMEXTRATAG $c37mod1&bar&foo:$c37mod2&[join $c37mod2extratag &]]
-lappend ans [list set __MODULES_LMTAG $c37mod1&bar&foo&auto-loaded:$c37mod2&[join $c37mod2tag &]]
+lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
+lappend ans [list set __MODULES_LMTAG $c37lmtag]
 set tserr [msg_load tag/8.0]
 testouterr_cmd_re sh "restore $coll37fp" $ans $tserr
 
@@ -1046,7 +1046,7 @@ lappend ans [list set __MODULES_LMPREREQ $c37mod2&[email protected]\ bar=val1]
 lappend ans [list set _LMFILES_ $c37lmf]
 lappend ans [list set LOADEDMODULES $c37lm]
 lappend ans [list set __MODULES_LMEXTRATAG $c37lmextratag]
-lappend ans [list set __MODULES_LMTAG $c37mod1&foo&auto-loaded:$c37mod2&[join $c37mod2tag &]]
+lappend ans [list set __MODULES_LMTAG $c37lmtag]
 set tserr [msg_unload variant/3.0{bar=val1}]\n[msg_unload foo/1.0]\n[msg_load variant/3.0{bar=val1}]\n[msg_load tag/8.0]
 testouterr_cmd_re sh "restore $coll37fp" $ans $tserr