[lmi-commits] [lmi] master 40499ba 1/3: Remove unwanted files before copying them

[Greg Chicares]

branch: master
commit 40499ba12d0d71e0569d2f4d6efe63a0f326af3e
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Remove unwanted files before copying them
    
    The first time a system test is performed in a new chroot, it finds no
    touchstone to compare against, so a spurious error report is issued.
    That behavior is correct in general, but is disregarded for new chroots
    (which presumably use only previously-accepted code).
    
    Previously, freshly-generated results were copied to the touchstone/
    directory, and then datestamped analyses were removed therefrom. Now,
    datestamped analyses are first removed, then only the remaining files
    are copied. This may seem to be a needless refinement, but it has the
    very desirable effect of causing the expanded copy command to be
    identical between runs that use the same testdecks, so that successive
    logs don't routinely mismatch on a 50000-character line, starting from
    byte 7000 or so.
    
    Removing datestamped analyses from the test/ directory does no harm:
    because the first system test failed completely, they contain no useful
    information.
---
 lmi_setup_43.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index 6cd9e65..6a7b648 100755
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -109,10 +109,10 @@ coefficiency="--jobs=$(nproc)"
 cd /opt/lmi/src/lmi || { printf 'failed: cd\n'; exit 3; }
 make "$coefficiency" system_test 2>&1 |sed -e'/^Cannot open.*test/d'
 # That test fails the first time because no results are saved in
-# touchstone/ yet. Copy the results just generated...
+# touchstone/ yet. Remove timestamped summaries...
+rm /opt/lmi/test/analysis-* /opt/lmi/test/diffs-* /opt/lmi/test/md5sums-*
+# ...copy the results just generated...
 cp -a /opt/lmi/test/* /opt/lmi/touchstone
-# ...removing summaries...
-rm /opt/lmi/touchstone/analysis* /opt/lmi/touchstone/diffs* 
/opt/lmi/touchstone/md5sum*
 # ...and rerun the test, which should now succeed:
 make "$coefficiency" system_test