Changeset 2292

Timestamp:

02/02/22 12:00:39 (2 years ago)

Author:

jderouillat

Message:

Fix in the test suite to launch generic_testcase only if compile succeed. + Minor fix for ccc_mpp

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite

Files:

• TEST_SUITE/my_run.sh (modified) (2 diffs)
• TEST_SUITE/run_test (modified) (3 diffs)
• launch_all (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/my_run.sh

@@ -39 +39 @@
 
   i=0
-  output=$(ccc_mpp | grep ${jobid})
+  output=$(ccc_mpp -n -u ${USER} | grep ${jobid})
   while [ ! -z "$output" ]
   do
@@ -45 +45 @@
     sleep 30
     ((i+=30))
-    output=$(ccc_mpp | grep ${jobid})
+    output=$(ccc_mpp -n -u ${USER} | grep ${jobid})
     if [[ $i -eq 300 ]]; then
       ccc_mdel $jobid

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

@@ -27 +27 @@
   echo "./make_xios --arch_path `pwd`/../ARCH --arch ${arch} --${mode} --use_tv --build_dir ${build_dir} --job 16" >> compile.sh
   cmd=$(sbatch compile.sh)
+  sleep 10
   jobid="${cmd//[!0-9]/}"
+  i=0
   output=$(squeue -u uim55ri | grep ${jobid})
   while [ ! -z "$output" ]
@@ -59 +61 @@
   echo "./make_xios --arch_path `pwd`/../ARCH --arch ${arch} --${mode} --use_tv ${enable_mem_track} --build_dir ${build_dir} --job 16" >> compile.sh
   cmd=$(ccc_msub compile.sh)
+  sleep 10
   jobid="${cmd//[!0-9]/}"
-  output=$(ccc_mpp | grep ${jobid})
+  i=0
+  output=$(ccc_mpp -n -u ${USER} | grep ${jobid})
   while [ ! -z "$output" ]
   do
@@ -66 +70 @@
     sleep 30
     ((i+=30))
-    output=$(ccc_mpp | grep ${jobid})
+    output=$(ccc_mpp -n -u ${USER}Â | grep ${jobid})
   done
 
 fi
 
-build_info=$(sacct -j $jobid -o State)
-if [[ $build_info == *"COMPLETED"* ]]; then
+#build_info=$(sacct -j $jobid -o State)
+#if [[ $build_info == *"COMPLETED"* ]]; then
+exec=${build_dir}/bin/generic_testcase.exe
+if [[ -f "$exec" ]]; then
   build_ok=true
 else

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/launch_all

@@ -8 +8 @@
 source ./load_env
 ./launch_compile $1 $2
-./launch_test_suite $1 $2
+if [[ -n $(find BUILD/ -name generic_testcase.exe) ]]
+then
+    ./launch_test_suite $1 $2
+else
+    echo "All compilation test failed"
+fi