Changeset 1734 for XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/run_sub_test.sh

Timestamp:

10/04/19 17:36:51 (5 years ago)

Author:

yushan

Message:

GENERIC_TESTCASE : check all .nc files by default. Generate Cmake files from python scripts (user_config.py, setup.py). Add scripts for copy to/from compressed reference stored in /gpfswork/rech/psl/rpsl954 (Jean-Zay and Irene).

File:

• XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/run_sub_test.sh (modified) (5 diffs)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/test_axis_algo/run_sub_test.sh

@@ -11 +11 @@
 cp ../default_param.py default_param.py
 
-cp ../iodef.xml iodef.xml
 
 # Black        0;30     Dark Gray     1;30
@@ -23 +22 @@
 
 
-mv iodef.xml iodef.xml.bkp
 
 nb_proc=$(python sub_config.py 2>&1) 
@@ -29 +27 @@
 machine_name=jeanzay
 
-echo $nb_proc
+# echo $nb_proc
 if [[ ($machine_name == irene) ]]
 then
@@ -46 +44 @@
             echo "execution failed"
             rm -f iodef.xml
-            mv iodef.xml.bkp iodef.xml
             rm -f user_param.py
             rm -f default_param.py
             rm -f sub_config.py
+            rm -f sub_check.py
             exit 1234
     fi
@@ -57 +55 @@
 fi
 
-python sub_check.py
+check_output=$(python sub_check.py 2>&1 >/dev/null)
+if [[ "$check_output" -ne 0 ]]
+then
+    echo "check.py failed"
+    rm -f iodef.xml
+    rm -f user_param.py
+    rm -f default_param.py
+    rm -f sub_config.py
+    rm -f sub_check.py
+    exit 1
+else
+    echo "check.py OK"
+fi
+
 
 rm -f iodef.xml
-mv iodef.xml.bkp iodef.xml
 rm -f user_param.py
 rm -f default_param.py
 rm -f sub_config.py
+rm -f sub_check.py