script: fix "mb" now modulecmd.tcl may exit with non-zero code

xdelaruelle · xdelaruelle · commit acea5b4b1931 · 2024-10-21T13:45:09.000+02:00
diff --git a/script/mb b/script/mb
@@ -1,7 +1,7 @@
 #!/usr/bin/env tclsh
 #
 # MB, make bench between modulecmd versions
-# Copyright (C) 2019-2022 Xavier Delaruelle
+# Copyright (C) 2019-2024 Xavier Delaruelle
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,8 +55,8 @@ set curdir [pwd]
 
 # time test run for a given modulecmd version
 proc bench {tag args} {
-   return [expr {round([lindex [split [time {eval exec ./modulecmd.$tag sh\
-      $args >>& /dev/null} $::benchrep]] 0] / 1000)}]
+   return [expr {round([lindex [split [time {catch {exec ./modulecmd.$tag sh\
+      {*}$args >>& /dev/null}} $::benchrep]] 0] / 1000)}]
 }
 
 # profile given modulecmd version test run

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/usr/bin/env tclsh`
`2`	`2`	`#`
`3`	`3`	`# MB, make bench between modulecmd versions`
`4`		`-# Copyright (C) 2019-2022 Xavier Delaruelle`
	`4`	`+# Copyright (C) 2019-2024 Xavier Delaruelle`
`5`	`5`	`#`
`6`	`6`	`# This program is free software: you can redistribute it and/or modify`
`7`	`7`	`# it under the terms of the GNU General Public License as published by`
`@@ -55,8 +55,8 @@ set curdir [pwd]`
`55`	`55`
`56`	`56`	`# time test run for a given modulecmd version`
`57`	`57`	`proc bench {tag args} {`
`58`		`- return [expr {round([lindex [split [time {eval exec ./modulecmd.$tag sh\`
`59`		`- $args >>& /dev/null} $::benchrep]] 0] / 1000)}]`
	`58`	`+ return [expr {round([lindex [split [time {catch {exec ./modulecmd.$tag sh\`
	`59`	`+ {*}$args >>& /dev/null}} $::benchrep]] 0] / 1000)}]`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`# profile given modulecmd version test run`