Changeset 2272

Timestamp:

12/08/21 11:42:24 (3 years ago)

Author:

jderouillat

Message:

Introduce different levels of test in test suite, levels can be set in function of the machine, arch and mode.

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE

Files:

• run_test (modified) (1 diff)
• step1.py (modified) (3 diffs)
• test_axis_algo/user_param.json (deleted)
• test_axis_algo/user_param_advanced.json (added)
• test_axis_algo/user_param_basic.json (added)
• test_domain_algo/user_param.json (deleted)
• test_domain_algo/user_param_advanced.json (added)
• test_domain_algo/user_param_basic.json (added)
• test_dynamico_algo/user_param.json (deleted)
• test_dynamico_algo/user_param_advanced.json (added)
• test_dynamico_algo/user_param_basic.json (added)
• test_function/user_param.json (deleted)
• test_function/user_param_advanced.json (added)
• test_function/user_param_basic.json (added)
• test_grid_algo/user_param.json (deleted)
• test_grid_algo/user_param_advanced.json (added)
• test_grid_algo/user_param_basic.json (added)
• test_scalar_algo/user_param.json (deleted)
• test_scalar_algo/user_param_advanced.json (added)
• test_scalar_algo/user_param_basic.json (added)

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/run_test

@@ -98 +98 @@
     do
       mkdir -p ${rundir}/def_files/${svnR}/${i%%} ; CHMOD ${rundir}/def_files/${svnR}/${i%%}
-      cp ${i%%}/user_param.json ${rundir}/def_files/${svnR}/${i%%}
+      cp ${i%%}/user_param_*.json ${rundir}/def_files/${svnR}/${i%%}
       for j in $(ls -d ${i%%/}/CONFIG_*)
       do

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/step1.py

@@ -23 +23 @@
 def OSinfo(runthis):
     red = lambda text: '\033[0;31m' + text + '\033[0m'
-    osstdout = subprocess.Popen(runthis, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
-    theInfo = osstdout.communicate()[0].strip()
-    if osstdout.returncode!=0:
+    osstdout = subprocess.Popen(runthis, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+    theInfo, theErr = osstdout.communicate()
+    #print( theInfo )
+    if theErr:
         print(red(runthis+" FAILED"))
-        print(theInfo)
+        print(theErr)
         sys.exit()
 
@@ -44 +45 @@
     def_param=dict(l)
     return def_param
+
+def get_test_type():
+    test_type = "basic"
+    if ( machine == "irene" ):
+        test_type = "advanced"
+    return test_type
 
 def generate_job(fn, n):
@@ -165 +172 @@
     #print(default_param)
 
+    # default = basic, function( machine, arch, mode )
+    test_type = get_test_type()
+
     for test_folder in test_folder_list:
         config_list=[]
         config_name=[]
-        with open(test_folder+"/user_param.json", "r") as f:
+        with open(test_folder+"/user_param_"+test_type+".json", "r") as f:
             config_dict = json.load(f)