From 2006028e2d88faf478e3cdc4f0282935856a0086 Mon Sep 17 00:00:00 2001 From: mkavulich Date: Fri, 10 Mar 2017 15:29:00 -0700 Subject: [PATCH] Fixing the code to move old results files; should only move files of the same type since each type of test calls this script individually. --- scripts/allCheck.ksh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/allCheck.ksh b/scripts/allCheck.ksh index 3a0bb4b..68ec606 100755 --- a/scripts/allCheck.ksh +++ b/scripts/allCheck.ksh @@ -200,15 +200,17 @@ writeBitForBit() mkdir -p ${TEST_DIR}/RESULTS/old -#Move old results into "old" directory to avoid confusion -OLD_RESULTS=`\ls ${TEST_DIR}/RESULTS/` -for oldr in $OLD_RESULTS; do - mv ${TEST_DIR}/RESULTS/$oldr ${TEST_DIR}/RESULTS/old/ -done - # The ID string for this particular test; it is typically something like "wrf_" TEST_ID=`basename $TARFILE .tar` +#Move old results into "old" directory to avoid confusion +export OLD_RESULT_FILE=${TEST_DIR}/RESULTS/${TEST_ID}_${COMPILER_WTF}_${CONFIGURE_CHOICES} +export OLD_RESULT_FILE=`echo $OLD_RESULT_FILE | sed 's/ /_/g'` +OLD_RESULTS=`\ls ${OLD_RESULT_FILE}*` +for oldr in $OLD_RESULTS; do + mv $oldr ${TEST_DIR}/RESULTS/old/ +done + # The path to the file containing a summary of all test results #export SUMMARY_FILE=${TEST_DIR}/RESULTS/${TEST_ID}_${COMPILER_WTF}.`date +"%Y-%m-%d_%T"` export SUMMARY_FILE=${TEST_DIR}/RESULTS/${TEST_ID}_${COMPILER_WTF}_${CONFIGURE_CHOICES}.`date +"%Y-%m-%d_%T"`