Changeset 3631 for palm

Timestamp:

Dec 17, 2018 2:21:34 PM (6 years ago)

Author:

knoop

Message:

removed testcases from INSTALL dir and modified palm_installer_components accordingly

Location:

palm/trunk/INSTALL

Files:

• example_cbl_p3d (deleted)
• example_cbl_rc (deleted)
• palm_installer_components (modified) (2 diffs)
• test_oceanml_p3d (deleted)
• test_oceanml_rc (deleted)

palm/trunk/INSTALL/palm_installer_components

@@ -133 +133 @@
    local input_dir=${install_prefix}/JOBS/${1}/INPUT/
    local monitoring_dir=${install_prefix}/JOBS/${1}/MONITORING/
-   local test_dir=${trunk_dir}/INSTALL
-   if [[ ! -f ${test_dir}/${1}_p3d ]] || [[ ! -f ${test_dir}/${1}_rc ]]; then
-      printf "\e[1;31m test not found\e[0m\n"
-      return 1
-   fi
+   local test_dir=${trunk_dir}/TESTS/cases
    rm -rf ${monitoring_dir}
    mkdir -p ${input_dir}
-   cp ${test_dir}/${1}_p3d ${input_dir}
-   [[ -f ${test_dir}/${1}_topo ]] && cp ${test_dir}/${1}_topo ${input_dir}
+   cp ${test_dir}/${1}/INPUT/${1}_p3d ${input_dir}
    bash ${trunk_dir}/SCRIPTS/palmrun -r ${1} -a "d3#" -c "default" -X "$NUM_PROC_TEST" -T "$NUM_PROC_TEST" -v -B > ${install_prefix}/${logfile_test} 2>&1
    grep -A 99999 "Run-control output" JOBS/${1}/MONITORING/${1}_rc 1> ${install_prefix}/RC_LOCAL 2> /dev/null
-   grep -A 99999 "Run-control output" ${test_dir}/${1}_rc 1> ${install_prefix}/RC_DEFAULT 2> /dev/null
+   grep -A 99999 "Run-control output" ${test_dir}/${1}/MONITORING/${1}_rc 1> ${install_prefix}/RC_DEFAULT 2> /dev/null
    diff_output=$(diff ${install_prefix}/RC_DEFAULT ${install_prefix}/RC_LOCAL)
    rm ${install_prefix}/RC_LOCAL ${install_prefix}/RC_DEFAULT
@@ -159 +154 @@
 palm_installer_test_suite() {
    rm -f ${install_prefix}/${logfile_test}
-   for test_path in ${trunk_dir}/INSTALL/*_p3d; do
-      testname_p3d=$(basename $test_path)
-      palm_installer_test "${testname_p3d%_p3d}"
-   done
+   palm_installer_test "example_cbl_short" # ToDo: replace with palmtest python script
    hrule
    cat ${install_prefix}/${logfile_test} >> ${logfile_all}