Changeset 3631


Ignore:
Timestamp:
Dec 17, 2018 2:21:34 PM (3 years ago)
Author:
knoop
Message:

removed testcases from INSTALL dir and modified palm_installer_components accordingly

Location:
palm/trunk/INSTALL
Files:
4 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/INSTALL/palm_installer_components

    r3628 r3631  
    133133   local input_dir=${install_prefix}/JOBS/${1}/INPUT/
    134134   local monitoring_dir=${install_prefix}/JOBS/${1}/MONITORING/
    135    local test_dir=${trunk_dir}/INSTALL
    136    if [[ ! -f ${test_dir}/${1}_p3d ]] || [[ ! -f ${test_dir}/${1}_rc ]]; then
    137       printf "\e[1;31m test not found\e[0m\n"
    138       return 1
    139    fi
     135   local test_dir=${trunk_dir}/TESTS/cases
    140136   rm -rf ${monitoring_dir}
    141137   mkdir -p ${input_dir}
    142    cp ${test_dir}/${1}_p3d ${input_dir}
    143    [[ -f ${test_dir}/${1}_topo ]] && cp ${test_dir}/${1}_topo ${input_dir}
     138   cp ${test_dir}/${1}/INPUT/${1}_p3d ${input_dir}
    144139   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
    145140   grep -A 99999 "Run-control output" JOBS/${1}/MONITORING/${1}_rc 1> ${install_prefix}/RC_LOCAL 2> /dev/null
    146    grep -A 99999 "Run-control output" ${test_dir}/${1}_rc 1> ${install_prefix}/RC_DEFAULT 2> /dev/null
     141   grep -A 99999 "Run-control output" ${test_dir}/${1}/MONITORING/${1}_rc 1> ${install_prefix}/RC_DEFAULT 2> /dev/null
    147142   diff_output=$(diff ${install_prefix}/RC_DEFAULT ${install_prefix}/RC_LOCAL)
    148143   rm ${install_prefix}/RC_LOCAL ${install_prefix}/RC_DEFAULT
     
    159154palm_installer_test_suite() {
    160155   rm -f ${install_prefix}/${logfile_test}
    161    for test_path in ${trunk_dir}/INSTALL/*_p3d; do
    162       testname_p3d=$(basename $test_path)
    163       palm_installer_test "${testname_p3d%_p3d}"
    164    done
     156   palm_installer_test "example_cbl_short" # ToDo: replace with palmtest python script
    165157   hrule
    166158   cat ${install_prefix}/${logfile_test} >> ${logfile_all}
Note: See TracChangeset for help on using the changeset viewer.