Changeset 5037

Timestamp:

Jul 9, 2024, 3:52:58 PM (2 months ago)

Author:

abarral

Message:

some improvements to automated tests

File:

• BOL/script_install_amaury/test_compils.sh (modified) (5 diffs)

BOL/script_install_amaury/test_compils.sh

@@ -4 +4 @@
 set -eu
 
+## Params
+
+#submit_cmd="sbatch -A $(/usr/sbin/my_project.py -l 2>&1 | head -1 | cut -d " " -f 3- | cut -c 5-) --constraint=GENOA --time=00:15:00 -N 1 -n 1 -c 8"  # to launch on Adastra /!\ Not working rn, since jobs don't have internet access
+submit_cmd=""  # to launch directly
+#base_args="-arch_dir arch_local -arch local-gfortran"  # to use local arch
+base_args="-arch local-gfortran-parallel"
+
+
+## End params
+
+local=$(pwd)
 mkdir -p test_logs
 
@@ -10 +21 @@
 
     # Create test args
-    args="-arch_dir arch_local -arch local-gfortran"
-    if [[ ! $parallel = "none" ]]; then
-        args="$args-parallel"
-    fi
-    args="$args -rad $rad -parallel $parallel -netcdf 0 -veget $veget $xios $lmdzrev $cosp"
+    local args="$base_args -rad $rad -parallel $parallel -netcdf 0 -veget $veget $xios $lmdzrev $cosp"
     # trim
     args=$(echo "$args" | xargs)
 
-    logfile="test_logs/$args.out"
-    if [[ -f $logfile ]]; then return; fi
+    local logfile="$local/test_logs/$args.out"
+    if [[ -f $logfile ]]; then return; fi  # ALready exists = test already ran
     echo "Testing $args"
-    rm -rf LMDZ
 
+    # Create temp folder
+    mkdir -p "test_logs/${args// /_}_$$" && cd "test_logs/${args// /_}_$$"
+    cp ../../install_lmdz.sh .
 
     # shellcheck disable=SC2086
-    if ! ./install_lmdz.sh -name LMDZ $args > "$logfile" 2>&1; then
+    local test_cmd="$submit_cmd ./install_lmdz.sh -name LMDZ $args"
+    if ! $test_cmd > "$logfile" 2>&1; then
         # Check bench success if bench
         if (grep -q "EXECUTION DU BENCH" < "$logfile") && (! grep -q "Everything is cool" < "$logfile"); then
@@ -36 +46 @@
 
 function run_all_tests {
+    cd "$local"
     for parallel in "none" "mpi_omp"; do
     for rad in "oldrad" "rrtm" "ecrad"; do
@@ -41 +52 @@
     for xios in "" "-xios"; do
       if [[ $xios = "-xios" && $parallel = "none" ]]; then continue; fi
-    for lmdzrev in "" "-r 4894"; do  # TODO when base lmdz becomes >=4894, change condition for lmdzrev=""
-        if [[ (! $veget = "none") && ($parallel = "none") && ($(echo "$lmdzrev" | cut -c 4-) -lt 4894) ]]; then continue; fi
+    for lmdzrev in ""; do
     for cosp in "" "-cosp v1" "-cosp v2"; do
         do_one_test
@@ -54 +64 @@
 
 function display_results {
-    cd "test_logs"
+    cd "$local/test_logs"
     echo "Success=o, Failure=XXX, non-breaking error=/!\\"
     echo "INSTALL  BENCH  NAME"
-    for fname in *; do
+    for fname in *.out; do
         if [[ $(tail -n 1 -- "$fname") = " Everything is cool" ]]; then
             if grep -q "Error" < "$fname"; then