Changeset 1812

Timestamp:

12/19/19 16:24:42 (4 years ago)

Author:

ymipsl

Message:

XIOS test suite : some update
YM

Location:

XIOS/trunk/xios_test_suite

Files:

• COMPILE/config_compile.py (modified) (1 diff)
• TEST_SUITE/generate_test.py (modified) (1 diff)
• TEST_SUITE/run_test (modified) (2 diffs)
• TEST_SUITE/run_test_irene (modified) (1 diff)
• TOOLS/copy_to_forge (modified) (1 diff)
• TOOLS/copy_to_thredds (modified) (1 diff)
• launch_compile (modified) (1 diff)

XIOS/trunk/xios_test_suite/COMPILE/config_compile.py

@@ -67 +67 @@
             
             f.write("add_test( NAME "+build_dir_name+'\n')
-            f.write("          COMMAND bash -c \"source ../ARCH/arch-"+configs_arg[0][i]+".env && module load cmake && cd ../.. && ./make_xios --arch_dir xios_test_suite/ARCH --arch "+configs_arg[0][i]+" --"+configs_arg[1][j]+" --job 16 --build_dir build_"+build_dir_name+" | tail -n 1 >> Compile/build_"+revision+"_"+machine+"_"+build_dir_name+".txt\")\n\n")
+            f.write("          COMMAND bash -c \"source ../ARCH/arch-"+configs_arg[0][i]+".env && module load cmake && cd ../.. && ./make_xios --arch_dir xios_test_suite/ARCH --arch "+configs_arg[0][i]+" --"+configs_arg[1][j]+" --job 16 --build_dir xios_test_suite/BUILD/build_"+build_dir_name+" | tail -n 1 >> xios_test_suite/COMPILE/build_"+revision+"_"+machine+"_"+build_dir_name+".txt\")\n\n")
             f.write("set_tests_properties( "+build_dir_name+" PROPERTIES\n")
             f.write("                      FAIL_REGULAR_EXPRESSION \"failed\")\n\n")

XIOS/trunk/xios_test_suite/TEST_SUITE/generate_test.py

@@ -92 +92 @@
     print(myTestList)
   
-    f=open("test_"+machine+"_info.js", "w")
+    f=open("_test_"+machine+"_info.js", "w")
     f.write("var test_"+machine+"_revision_list = "+repr(revision_list)+"\n\n")
     f.write("var test_"+machine+"_info_list = [\n")

XIOS/trunk/xios_test_suite/TEST_SUITE/run_test

@@ -90 +90 @@
 
 cp plein_report.txt ${rundir}/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
-chmod -quiet ug+rw ${rundir}/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
+chmod --quiet ug+rw ${rundir}/test_${machine_name}/test_${xios_revision}_${machine_name}_${arch}_${mode}.txt
 
-mkdir -p ${rundir}/def_files ;  chmod -quiet ug+rwx ${rundir}/RUN/def_files
-mkdir -p ${rundir}/def_files/${xios_revision} ;  chmod -quiet ug+rwx ${rundir}/def_files/${xios_revision}
+mkdir -p ${rundir}/def_files ;  chmod --quiet ug+rwx ${rundir}/RUN/def_files
+mkdir -p ${rundir}/def_files/${xios_revision} ;  chmod --quiet ug+rwx ${rundir}/def_files/${xios_revision}
 
 for i in $(ls -d test_*/)
@@ -104 +104 @@
     cp ${j%%}/setup/all_param.def ${rundir}/def_files/${xios_revision}/${j%%}  
   done
-  chmod -R -quiet ug+rwx ${rundir}/def_files
+  chmod -R --quiet ug+rwx ${rundir}/def_files
 done
 

XIOS/trunk/xios_test_suite/TEST_SUITE/run_test_irene

@@ -4 +4 @@
 
 bash -c "python generate_test.py"
+mv _test_${xios_machine_name}_info.js test_${xios_machine_name}_info.js
 copy_to_thredds  test_${xios_machine_name}_info.js
+mv test_${xios_machine_name}_info.js _test_${xios_machine_name}_info.js

XIOS/trunk/xios_test_suite/TOOLS/copy_to_forge

@@ -8 +8 @@
 do
   scp $file $forge_IP:$FORGE_DIR 
-  ssh $forge_IP "chmod a+rw ${FORGE_DIR}/${file}"
+  ssh $forge_IP "chmod --quiet a+rw ${FORGE_DIR}/${file}"
 done

XIOS/trunk/xios_test_suite/TOOLS/copy_to_thredds

@@ -5 +5 @@
 for file in $files 
 do
-  cp $file $THREDDS_DIR ; chmod g+wr $THREDDS_DIR/$file ; chmod o+r $THREDDS_DIR/$file
+  cp $file $THREDDS_DIR ; chmod --quiet g+wr $THREDDS_DIR/$file ; chmod --quiet o+r $THREDDS_DIR/$file
 done

XIOS/trunk/xios_test_suite/launch_compile

@@ -2 +2 @@
 
 source ./load_env
+mkdir -p BUILD
 (cd COMPILE && ./compile_${xios_machine_name})