Changes in / [62293e5:e973e0e] in flexpart.git

Location:

tests/NILU

Files:

• run_test (modified) (3 diffs)
• run_tests (modified) (3 diffs)

tests/NILU/run_test

@@ -6 +6 @@
 base_dir=$3  # base for the output
 options_default=$4
-
-echo run test '>' input
-echo $1
-echo $2
-echo $3
-echo $4
-
-#  echo name= $name
-#  echo working dir= $path_tests/test_$name
-#  echo executable= $FP_exec 
-#  echo default options from $options_default 
  
 #echo FP_exec=$FP_exec
-echo env var FLEXOUT_TMP=$FLEXOUT_TP
+echo $FLEXOUT_TMP
 
 #suffix=$(date "+%y-%m-%d_%H%M%S")
@@ -29 +18 @@
 mkdir $test_tmp
 
-echo run test '>' copy default options to temp dir
-echo from  $options_default  to $test_tmp/options
+echo copy default options $options_default  to temp dir $test_tmp/options
 cp -r $options_default $test_tmp/options
 #override default options
-echo copy test options files to temp dir
-echo ${test_dir}/options/* $test_tmp/options/
-cp   ${test_dir}/options/* $test_tmp/options/
-echo copy test options/SPECIES to temp dir if needed
-
-if [ -d "${test_dir}/options/SPECIES" ]; then
-echo from ${test_dir}/options/SPECIES/* to $test_tmp/options/SPECIES/
-cp        ${test_dir}/options/SPECIES/*    $test_tmp/options/SPECIES/
-fi
-
+echo copy this test option files to temp dir
+cp  ${test_dir}/options/* $test_tmp/options/
+echo copy SPECIES from ${test_dir}/options/SPECIES/* to $test_tmp/options/SPECIES/
+cp  ${test_dir}/options/SPECIES/* $test_tmp/options/SPECIES/
 # copy paths form repo source exec tmp dir 
-echo copy test pathnames to temp dir
 cp ${test_dir}/pathnames $test_tmp
-echo create output dir ${test_tmp}/output
 mkdir ${test_tmp}/output
 
@@ -57 +37 @@
 #echo run $FP_exec   to  out.log #&
 #$FP_exec   &> out.log #&
-echo execute test
 $FP_exec > stdout.log 2> stderr.log #&
-echo flexpart terminated
 
 

tests/NILU/run_tests

@@ -37 +37 @@
 #declare -a test_names=('1' 'HelloWorld' 'Fwd1' 'Fwd2' 'Bwd1' 'Volc' '2')
 
+#blabla
 #Print the Whole Bash Array
 s_test_names=${test_names[@]}
@@ -42 +43 @@
 n_tests=${#test_names[@]}
 #echo n_tests=$n_tests
-echo run $s_test_names
-echo total $n_tests tests
+echo run $n_tests  tests:  $s_test_names
+
 #test
 #tests_dir='tests_15-08-19_113139/'
@@ -56 +57 @@
   let j=i+1
   name=${test_names[i]};
-  echo run test no. $j  
-#  echo name= $name
-#  echo working dir= $path_tests/test_$name
-#  echo executable= $FP_exec 
-#  echo default options from $options_default 
+  echo test no. $j name= $name
+  echo in $path_tests/test_$name
   ./run_test test_$name  $FP_exec $path_tests $options_default
-  echo test $name terminated
+  echo terminated
   success="$(cat $path_tests/test_$name/$outlog  | grep CONGRATULATIONS  | wc -l)"
   echo success=$success