--testset works properly with HMNS. Needed to add toolchain in

module load for checking python, R, Ruby, and perl packages.
The list PYTHON_APPS and MPI_APPS need to be in lower case

Author: shahzebsiddiqui

framework/env.py

@@ -36,8 +36,8 @@
 BUILDTEST_JOB_EXTENSION = [".lsf", ".slurm", ".pbs"]
 BUILDTEST_SHELLTYPES = ["sh", "bash", "csh"]
 
-PYTHON_APPS = ["Python","Anaconda2", "Anaconda3"]
-MPI_APPS = ["OpenMPI", "MPICH","MVAPICH2", "intel", "impi"]
+PYTHON_APPS = ["python","anaconda2", "anaconda3"]
+MPI_APPS = ["openmpi", "mpich","mvapich2", "intel", "impi"]
 
 #BUILDTEST_DEFAULT_CONFIG=os.path.join(BUILDTEST_ROOT,"config.yaml")
 #print BUILDTEST_DEFAULT_CONFIG

framework/test/testsets.py

@@ -58,7 +58,6 @@ def run_testset(arg_dict):
     codedir=""
     logcontent = ""
     runtest = False
-
     if appname.lower() in PYTHON_APPS and arg_dict.testset == "Python":
         source_app_dir=os.path.join(BUILDTEST_PYTHON_REPO,"python")
         runtest=True
@@ -87,7 +86,6 @@ def run_testset(arg_dict):
         codedir=os.path.join(source_app_dir,"code")
         recursive_gen_test(configdir,codedir)
         return
-
     if runtest == True:
         codedir=os.path.join(source_app_dir,"code")
         testset_generator(arg_dict,codedir)
@@ -117,6 +115,7 @@ def testset_generator(arg_dict, codedir):
     emptylist = []
     testset_name = os.path.basename(os.path.dirname(codedir))
 
+    print codedir, testset_name
     if os.path.isdir(codedir):
         totalcount = 0
         for root,subdirs,files in os.walk(codedir):
@@ -217,8 +216,15 @@ def verify_python_library(python_lib):
     appname=get_appname()
     appver=get_appversion()
 
+    BUILDTEST_MODULE_NAMING_SCHEME = config_opts['BUILDTEST_MODULE_NAMING_SCHEME']
     cmd = "module purge; module load " + os.path.join(appname,appver) + "; python -c \"import " + python_lib + "\""
 
+    if BUILDTEST_MODULE_NAMING_SCHEME == "HMNS":
+        tcname = get_toolchain_name()
+        tcver = get_toolchain_version()
+        if len(tcname) > 0:
+            cmd = "module purge; module load " + os.path.join(tcname,tcver) + "; module load " + os.path.join(appname,appver) + "; python -c \"import " +  python_lib + "\""
+
     logger.debug("Check Python Package:" + python_lib)
     logger.debug("Running command -" + cmd)
 
@@ -235,8 +241,19 @@ def verify_R_library(R_lib):
     appname=get_appname()
     appver=get_appversion()
 
+    BUILDTEST_MODULE_NAMING_SCHEME = config_opts['BUILDTEST_MODULE_NAMING_SCHEME']
+    cmd = ""
+
+
     cmd = "module purge; module load " + os.path.join(appname,appver) + "; echo \"library(" + R_lib + ")\" | R -q --no-save "
 
+    if BUILDTEST_MODULE_NAMING_SCHEME == "HMNS":
+        tcname = get_toolchain_name()
+        tcver = get_toolchain_version()
+        if len(tcname) > 0:
+            cmd = "module purge; module load " + os.path.join(tcname,tcver) + "; module load " + os.path.join(appname,appver) + "; echo \"library(" + R_lib + ")\" | R -q --no-save "
+
+
     logger.debug("Check R Package:" + R_lib)
     logger.debug("Running command - " + cmd)
 
@@ -251,8 +268,15 @@ def verify_perl_module(perl_module):
     appname=get_appname()
     appver=get_appversion()
 
+    BUILDTEST_MODULE_NAMING_SCHEME = config_opts['BUILDTEST_MODULE_NAMING_SCHEME']
     cmd = "module purge; module load " + os.path.join(appname,appver) + "; perl -e \' use " +  perl_module + ";\'"
 
+    if BUILDTEST_MODULE_NAMING_SCHEME == "HMNS":
+        tcname = get_toolchain_name()
+        tcver = get_toolchain_version()
+        if len(tcname) > 0:
+            cmd = "module purge; module load " + os.path.join(tcname,tcver) + "; module load " + os.path.join(appname,appver) + "; perl -e \' use " + perl_module + ";\'"
+
     logger.debug("Checking Perl Module " + perl_module)
     logger.debug("Running command - " + cmd)
 
@@ -268,8 +292,15 @@ def verify_Ruby_gem(Ruby_gem):
     appname=get_appname()
     appver=get_appversion()
 
+    BUILDTEST_MODULE_NAMING_SCHEME = config_opts['BUILDTEST_MODULE_NAMING_SCHEME']
     cmd = "module purge; module load " + os.path.join(appname,appver) + "; gem list -i " + Ruby_gem
 
+    if BUILDTEST_MODULE_NAMING_SCHEME == "HMNS":
+        tcname = get_toolchain_name()
+        tcver = get_toolchain_version()
+        if len(tcname) > 0:
+            cmd = "module purge; module load " + os.path.join(tcname,tcver) + "; module load " + os.path.join(appname,appver) + "; gem list - i " + Ruby_gem
+
     logger.debug("Check Ruby gem:" + R_lib)
     logger.debug("Running command - " + cmd)