Release of version 4.0.0-beta

xdelaruelle · xdelaruelle · commit 8ec675c299d4 · 2017-09-25T18:23:48.000+02:00
Adapt testsuite to take new release name in account.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 	test testinstall instrument testcoverage
 
 CURRENT_VERSION := $(shell grep '^set MODULES_CURRENT_VERSION' \
-	modulecmd.tcl.in | cut -d ' ' -f 3)
+	modulecmd.tcl.in | cut -d ' ' -f 3 | tr -d \")
 DIST_PREFIX := modules-$(CURRENT_VERSION)
 
 # definitions for code coverage
@@ -184,7 +184,6 @@ else
 test: modulecmd.tcl
 endif
 	TCLSH=$(TCLSH); export TCLSH; \
-	MODULEVERSION=Tcl; export MODULEVERSION; \
 	OBJDIR=`pwd -P`; export OBJDIR; \
 	TESTSUITEDIR=`cd testsuite;pwd -P`; export TESTSUITEDIR; \
 	runtest --srcdir $$TESTSUITEDIR --objdir $$OBJDIR $(RUNTESTFLAGS) --tool modules
diff --git a/contrib/rpm/environment-modules.spec b/contrib/rpm/environment-modules.spec
@@ -209,7 +209,7 @@ fi
 
 
 %changelog
-* Mon Sep 18 2017 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.0.0-0.1.beta
+* Mon Sep 25 2017 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.0.0-0.1.beta
 - Update to 4.0.0-beta
 - Define compat subpackage to provide 3.2 compatiblity version also
   provided in source tarball
diff --git a/doc/Makefile b/doc/Makefile
@@ -2,7 +2,7 @@
 
 VERSION_FILE := ../modulecmd.tcl.in
 MAN_VERSION := "modules $(shell grep '^set MODULES_CURRENT_VERSION' \
-	$(VERSION_FILE) | cut -d ' ' -f 3)"
+	$(VERSION_FILE) | cut -d ' ' -f 3 | tr -d \")"
 MAN_HEADER := "Environment Modules"
 
 HTML_DIR := html
diff --git a/init/Makefile b/init/Makefile
@@ -2,7 +2,7 @@
 
 VERSION_FILE := ../modulecmd.tcl.in
 CURRENT_VERSION := $(shell grep '^set MODULES_CURRENT_VERSION' \
-	$(VERSION_FILE) | cut -d ' ' -f 3)
+	$(VERSION_FILE) | cut -d ' ' -f 3 | tr -d \")
 
 SH_LIKE  = sh ksh bash zsh profile.sh bash_completion
 CSH_LIKE = csh tcsh tcsh_completion profile.csh
diff --git a/modulecmd.tcl.in b/modulecmd.tcl.in
@@ -23,8 +23,8 @@
 #
 # Some Global Variables.....
 #
-set MODULES_CURRENT_VERSION 1.1005
-set MODULES_CURRENT_RELEASE_DATE "2017-09-04"
+set MODULES_CURRENT_VERSION "4.0.0-beta"
+set MODULES_CURRENT_RELEASE_DATE "2017-09-25"
 set g_debug 0 ;# Set to 1 to enable debugging
 set error_count 0 ;# Start with 0 errors
 set g_autoInit 0
@@ -5066,7 +5066,7 @@ proc cmdModuleHelp {args} {
    }
    popMode
    if {[llength $args] == 0} {
-      report "Modules Release Tcl $MODULES_CURRENT_VERSION " 1
+      report "Modules Release $MODULES_CURRENT_VERSION " 1
       report "($MODULES_CURRENT_RELEASE_DATE)" 1
       report {   Copyright GNU GPL v2 1991}
       report {Usage: module [options] [command] [args ...]}
@@ -5193,7 +5193,7 @@ if {[catch {
                 exit 0
             }
             {-V} - {--version} {
-                report "Modules Release Tcl $MODULES_CURRENT_VERSION\
+                report "Modules Release $MODULES_CURRENT_VERSION\
                   ($MODULES_CURRENT_RELEASE_DATE)"
                 exit 0
             }
diff --git a/testsuite/install.00-init/020-module.exp b/testsuite/install.00-init/020-module.exp
@@ -31,7 +31,7 @@ if {$verbose > 0} {
 }
 
 foreach shell $shell_list {
-   testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+   testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
    testall_cmd "$shell" "module foo" "" "$bad_cmd\n$type_help" 1
    testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "" "$cur_loaded\nnull" 0
    testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "" "$no_loaded" 0
diff --git a/testsuite/install.00-init/025-autoinit.exp b/testsuite/install.00-init/025-autoinit.exp
@@ -32,7 +32,7 @@ if {$verbose > 0} {
 }
 
 foreach shell $shell_list {
-   testall_cmd_re "autoinit:$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+   testall_cmd_re "autoinit:$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
    testall_cmd "autoinit:$shell" "module foo" "" "$bad_cmd\n$type_help" 1
    testall_cmd "autoinit:$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "" "$cur_loaded\nnull" 0
    testall_cmd "autoinit:$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "" "$no_loaded" 0
diff --git a/testsuite/install.00-init/040-subshell.exp b/testsuite/install.00-init/040-subshell.exp
@@ -64,7 +64,7 @@ foreach shell $shell_list {
             testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "^\$" ".*$dash_nf\n.*$dash_nf\n.*$dash_nf\n.*$dash_nf\$" 252
             testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "^\$" ".*$dash_nf\n.*$dash_nf\n.*$dash_nf\n.*$dash_nf\n.*$dash_nf\$" 123
          } else {
-            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
             testall_cmd "$shell" "module foo" "" "$bad_cmd\n$type_help" 1
             testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "" "$cur_loaded\nnull" 0
             testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "" "$no_loaded" 0
@@ -106,7 +106,7 @@ foreach shell $shell_list {
             testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "^\$" ".*$dash_nf\n.*$dash_nf\n.*$dash_nf\n.*$dash_nf\$" 252
             testall_cmd_re "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "^\$" ".*$dash_nf\n.*$dash_nf\n.*$dash_nf\n.*$dash_nf\n.*$dash_nf\$" 123
          } else {
-            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
             testall_cmd "$shell" "module foo" "" "$bad_cmd\n$type_help" 1
             testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "" "$cur_loaded\nnull" 0
             testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "" "$no_loaded" 0
diff --git a/testsuite/install.00-init/050-crossshell.exp b/testsuite/install.00-init/050-crossshell.exp
@@ -58,7 +58,7 @@ foreach subshell $shell_list {
                   if {$subshell eq "sh" && $sh_kind eq "dash"} {
                      testall_cmd_re "$shell" "module --version" "^\$" "$cmd_nf\$" 127
                   } else {
-                     testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+                     testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
                   }
                }
                default {
@@ -68,7 +68,7 @@ foreach subshell $shell_list {
          }
          # propagate in any cases as BASH_ENV is set everywhere
          bash {
-            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
          }
          ksh {
             testall_cmd_re "$shell" "module --version" "^\$" "$ksh_nf\$" 127
@@ -97,7 +97,7 @@ foreach subshell $shell_list {
                   if {$subshell eq "sh" && $sh_kind eq "dash"} {
                      testall_cmd_re "$shell" "module --version" "^\$" "$cmd_nf\$" 127
                   } else {
-                     testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+                     testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
                   }
                }
                default {
@@ -107,7 +107,7 @@ foreach subshell $shell_list {
          }
          # propagate in any cases as BASH_ENV is set everywhere
          bash {
-            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0
+            testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0
          }
          ksh {
             testall_cmd_re "$shell" "module --version" "^\$" "$ksh_nf\$" 127
diff --git a/testsuite/modules.00-init/015-version.exp b/testsuite/modules.00-init/015-version.exp
@@ -25,17 +25,11 @@
 # This command will only be run for the bourne shell
 #
 
-if [info exists env(MODULEVERSION)] {
-   set exp_vers $env(MODULEVERSION)    
-} else {
-   send_user "FATAL: MODULEVERSION env var needs to be set\n"
-   exit
-}
 set shell "sh"
 
 #
 # Check the version at first
 #
 
-testouterr_cmd_re "csh" "--version" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"
-testouterr_cmd_re "csh" "-V" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"
+testouterr_cmd_re "csh" "--version" "" "Modules Release \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"
+testouterr_cmd_re "csh" "-V" "" "Modules Release \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`#`
`24`	`24`	`# Some Global Variables.....`
`25`	`25`	`#`
`26`		`-set MODULES_CURRENT_VERSION 1.1005`
`27`		`-set MODULES_CURRENT_RELEASE_DATE "2017-09-04"`
	`26`	`+set MODULES_CURRENT_VERSION "4.0.0-beta"`
	`27`	`+set MODULES_CURRENT_RELEASE_DATE "2017-09-25"`
`28`	`28`	`set g_debug 0 ;# Set to 1 to enable debugging`
`29`	`29`	`set error_count 0 ;# Start with 0 errors`
`30`	`30`	`set g_autoInit 0`
`@@ -5066,7 +5066,7 @@ proc cmdModuleHelp {args} {`
`5066`	`5066`	`}`
`5067`	`5067`	`popMode`
`5068`	`5068`	`if {[llength $args] == 0} {`
`5069`		`- report "Modules Release Tcl $MODULES_CURRENT_VERSION " 1`
	`5069`	`+ report "Modules Release $MODULES_CURRENT_VERSION " 1`
`5070`	`5070`	`report "($MODULES_CURRENT_RELEASE_DATE)" 1`
`5071`	`5071`	`report { Copyright GNU GPL v2 1991}`
`5072`	`5072`	`report {Usage: module [options] [command] [args ...]}`
`@@ -5193,7 +5193,7 @@ if {[catch {`
`5193`	`5193`	`exit 0`
`5194`	`5194`	`}`
`5195`	`5195`	`{-V} - {--version} {`
`5196`		`- report "Modules Release Tcl $MODULES_CURRENT_VERSION\`
	`5196`	`+ report "Modules Release $MODULES_CURRENT_VERSION\`
`5197`	`5197`	`($MODULES_CURRENT_RELEASE_DATE)"`
`5198`	`5198`	`exit 0`
`5199`	`5199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ if {$verbose > 0} {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`foreach shell $shell_list {`
`34`		`- testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0`
	`34`	`+ testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0`
`35`	`35`	`testall_cmd "$shell" "module foo" "" "$bad_cmd\n$type_help" 1`
`36`	`36`	`testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "" "$cur_loaded\nnull" 0`
`37`	`37`	`testall_cmd "$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "" "$no_loaded" 0`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ if {$verbose > 0} {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`foreach shell $shell_list {`
`35`		`- testall_cmd_re "autoinit:$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0`
	`35`	`+ testall_cmd_re "autoinit:$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0`
`36`	`36`	`testall_cmd "autoinit:$shell" "module foo" "" "$bad_cmd\n$type_help" 1`
`37`	`37`	`testall_cmd "autoinit:$shell" "module use $contrib_modpath\; module purge\; module load null\; module list -t" "" "$cur_loaded\nnull" 0`
`38`	`38`	`testall_cmd "autoinit:$shell" "module use $contrib_modpath\; module purge\; module load null\; module unload null\; module list -t" "" "$no_loaded" 0`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ foreach subshell $shell_list {`
`58`	`58`	`if {$subshell eq "sh" && $sh_kind eq "dash"} {`
`59`	`59`	`testall_cmd_re "$shell" "module --version" "^\$" "$cmd_nf\$" 127`
`60`	`60`	`} else {`
`61`		`- testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0`
	`61`	`+ testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`default {`
`@@ -68,7 +68,7 @@ foreach subshell $shell_list {`
`68`	`68`	`}`
`69`	`69`	`# propagate in any cases as BASH_ENV is set everywhere`
`70`	`70`	`bash {`
`71`		`- testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0`
	`71`	`+ testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0`
`72`	`72`	`}`
`73`	`73`	`ksh {`
`74`	`74`	`testall_cmd_re "$shell" "module --version" "^\$" "$ksh_nf\$" 127`
`@@ -97,7 +97,7 @@ foreach subshell $shell_list {`
`97`	`97`	`if {$subshell eq "sh" && $sh_kind eq "dash"} {`
`98`	`98`	`testall_cmd_re "$shell" "module --version" "^\$" "$cmd_nf\$" 127`
`99`	`99`	`} else {`
`100`		`- testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0`
	`100`	`+ testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`default {`
`@@ -107,7 +107,7 @@ foreach subshell $shell_list {`
`107`	`107`	`}`
`108`	`108`	`# propagate in any cases as BASH_ENV is set everywhere`
`109`	`109`	`bash {`
`110`		`- testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release Tcl \\S+ (\\S+)\$" 0`
	`110`	`+ testall_cmd_re "$shell" "module --version" "^\$" "^Modules Release \\S+ (\\S+)\$" 0`
`111`	`111`	`}`
`112`	`112`	`ksh {`
`113`	`113`	`testall_cmd_re "$shell" "module --version" "^\$" "$ksh_nf\$" 127`
Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,11 @@`
`25`	`25`	`# This command will only be run for the bourne shell`
`26`	`26`	`#`
`27`	`27`
`28`		`-if [info exists env(MODULEVERSION)] {`
`29`		`- set exp_vers $env(MODULEVERSION)`
`30`		`-} else {`
`31`		`- send_user "FATAL: MODULEVERSION env var needs to be set\n"`
`32`		`- exit`
`33`		`-}`
`34`	`28`	`set shell "sh"`
`35`	`29`
`36`	`30`	`#`
`37`	`31`	`# Check the version at first`
`38`	`32`	`#`
`39`	`33`
`40`		`-testouterr_cmd_re "csh" "--version" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"`
`41`		`-testouterr_cmd_re "csh" "-V" "" "Modules Release $exp_vers \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"`
	`34`	`+testouterr_cmd_re "csh" "--version" "" "Modules Release \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"`
	`35`	`+testouterr_cmd_re "csh" "-V" "" "Modules Release \[0-9a-zA-Z\.\+\\-\]+ \\(\[0-9\-\]{10}\\)"`