Skip to content

Bug fix for #1309: false reports of test failures #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SamuelTrahanNOAA wants to merge 2 commits into from
Closed

Bug fix for #1309: false reports of test failures #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
341b743
Bug fix for #1309: false reports of test failures
SamuelTrahanNOAA Jul 5, 2022
6b311f7
remove the _compile_ file instead of _test_ in run_compile.sh
SamuelTrahanNOAA Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions tests/run_compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ write_fail_test() {
exit 1
}

remove_fail_test() {
echo "Removing test failure flag file for compile_${COMPILE_NR}"
if [[ ${OPNREQ_TEST} == true ]] ; then
rm -f $PATHRT/fail_opnreq_compile_${COMPILE_NR}
else
rm -f $PATHRT/fail_compile_${COMPILE_NR}
fi
}

if [[ $# != 4 ]]; then
echo "Usage: $0 PATHRT RUNDIR_ROOT MAKE_OPT COMPILE_NR"
exit 1
Expand All @@ -35,11 +44,7 @@ export COMPILE_NR=$4

cd ${PATHRT}
OPNREQ_TEST=${OPNREQ_TEST:-false}
if [[ ${OPNREQ_TEST} == true ]]; then
rm -f fail_opnreq_compile_${COMPILE_NR}
else
rm -f fail_compile_${COMPILE_NR}
fi
remove_fail_test

[[ -e ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env ]] && source ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env
source default_vars.sh
Expand Down Expand Up @@ -85,6 +90,9 @@ ls -l ${PATHTR}/tests/fv3_${COMPILE_NR}.exe

cp ${RUNDIR}/compile_*_time.log ${LOG_DIR}
cat ${RUNDIR}/job_timestamp.txt >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt

remove_fail_test

################################################################################
# End compile job
################################################################################
Expand Down
18 changes: 13 additions & 5 deletions tests/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ write_fail_test() {
exit 1
}

remove_fail_test() {
echo "Removing test failure flag file for ${TEST_NAME} ${TEST_NR}"
if [[ ${OPNREQ_TEST} == true ]] ; then
rm -f $PATHRT/fail_opnreq_test_${TEST_NR}
else
rm -f $PATHRT/fail_test_${TEST_NR}
fi
}

function compute_petbounds() {

# each test MUST define ${COMPONENT}_tasks variable for all components it is using
Expand Down Expand Up @@ -90,11 +99,7 @@ export COMPILE_NR=$5

cd ${PATHRT}
OPNREQ_TEST=${OPNREQ_TEST:-false}
if [[ ${OPNREQ_TEST} == true ]]; then
rm -f fail_opnreq_test_${TEST_NR}
else
rm -f fail_test_${TEST_NR}
fi
remove_fail_test

[[ -e ${RUNDIR_ROOT}/run_test_${TEST_NR}.env ]] && source ${RUNDIR_ROOT}/run_test_${TEST_NR}.env
source default_vars.sh
Expand Down Expand Up @@ -356,6 +361,9 @@ fi
if [[ $SCHEDULER != 'none' ]]; then
cat ${RUNDIR}/job_timestamp.txt >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
fi

remove_fail_test

################################################################################
# End test
################################################################################
Expand Down