[lmi-commits] [lmi] master aff817a 6/6: Fold 'errors.sed' into 'nychthemeral_test.sh'

[Greg Chicares]

branch: master
commit aff817a79247044d3a47f42c79fd7b4c9edb683d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fold 'errors.sed' into 'nychthemeral_test.sh'
    
    There is no longer any reason for 'errors.sed' to be a separate file.
---
 errors.sed            | 50 --------------------------------------------------
 nychthemeral_test.sh  | 34 +++++++++++++++++++++++++++++++++-
 tabs/3/startup_script |  2 +-
 3 files changed, 34 insertions(+), 52 deletions(-)

diff --git a/errors.sed b/errors.sed
deleted file mode 100644
index 2ec3968..0000000
--- a/errors.sed
+++ /dev/null
@@ -1,50 +0,0 @@
-# Parse 'nychthemeral_test.sh' output for errors.
-#
-# Copyright (C) 2018, 2019 Gregory W. Chicares.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-#
-# http://savannah.nongnu.org/projects/lmi
-# email: <address@hidden>
-# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-/^# install; check physical closure/d
-/^# cgi and cli tests/d
-/^Test common gateway interface:/d
-/^Test command line interface:/d
-/^Test sample.cns:/d
-/^Test sample.ill:/d
-/^# system test/d
-/^System test:/d
-/^All [1-9][0-9]* files match./d
-/^# unit tests/d
-/^[1-9][0-9]* tests succeeded/d
-/^# build with shared-object attributes/d
-/^# cgi and cli tests in libstdc++ debug mode/d
-/^Test common gateway interface:/d
-/^Test command line interface:/d
-/^Test sample.cns:/d
-/^Test sample.ill:/d
-/^# unit tests in libstdc++ debug mode/d
-/^[1-9][0-9]* tests succeeded/d
-/^# test concinnity/d
-/^  Problems detected by xmllint:/d
-/^  Miscellaneous problems:/d
-/^  *[1-9][0-9]* source files/d
-/^  *[1-9][0-9]* source lines/d
-/^  *[1-9][0-9]* marked defects/d
-/^# xrc tests/d
-/^# schema tests/d
-/^# test all valid emission types/d
-/^$/d
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 8c6f616..33f00c7 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -102,6 +102,38 @@ schemata_clutter='
 /^  Done\.$/d
 '
 
+nychthemeral_clutter='
+/^# install; check physical closure/d
+/^# cgi and cli tests/d
+/^Test common gateway interface:/d
+/^Test command line interface:/d
+/^Test sample.cns:/d
+/^Test sample.ill:/d
+/^# system test/d
+/^System test:/d
+/^All [1-9][0-9]* files match./d
+/^# unit tests/d
+/^[1-9][0-9]* tests succeeded/d
+/^# build with shared-object attributes/d
+/^# cgi and cli tests in libstdc++ debug mode/d
+/^Test common gateway interface:/d
+/^Test command line interface:/d
+/^Test sample.cns:/d
+/^Test sample.ill:/d
+/^# unit tests in libstdc++ debug mode/d
+/^[1-9][0-9]* tests succeeded/d
+/^# test concinnity/d
+/^  Problems detected by xmllint:/d
+/^  Miscellaneous problems:/d
+/^  *[1-9][0-9]* source files/d
+/^  *[1-9][0-9]* source lines/d
+/^  *[1-9][0-9]* marked defects/d
+/^# xrc tests/d
+/^# schema tests/d
+/^# test all valid emission types/d
+/^$/d
+'
+
 # Directory for test logs.
 log_dir=/tmp/lmi/logs
 mkdir --parents "$log_dir"
@@ -176,4 +208,4 @@ for z in /tmp/lmi/tmp/*(N); do rm "$z"; done
 # no such actions must be performed manually while it is running.
 # Therefore, it is deliberately excluded from this script.
 printf '\nDo not forget to run wx_test.\n'
-} 2>&1 | tee "$log_dir"/nychthemeral_test | sed -f errors.sed
+} 2>&1 | tee "$log_dir"/nychthemeral_test | sed -e "$nychthemeral_clutter"
diff --git a/tabs/3/startup_script b/tabs/3/startup_script
index 7d9a4af..03f381e 100755
--- a/tabs/3/startup_script
+++ b/tabs/3/startup_script
@@ -10,7 +10,7 @@ f="make \$coefficiency unit_tests 2>&1 | tee >(grep '\*\*\*') 
>(grep '????') >(g
 g='make $coefficiency all build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 | tee 
../log | sed -f diagnostics.sed | less -S'
 h='make $coefficiency cgi_tests cli_tests build_type=safestdlib 2>&1 | tee 
../log | sed -f diagnostics.sed | less -S'
 i="make \$coefficiency unit_tests build_type=safestdlib 2>&1 | tee >(grep 
'\*\*\*') >(grep '????') >(grep '!!!!' --count | xargs printf '%d tests 
succeeded\n') >../log"
-j='./nychthemeral_test.sh 2>&1 | tee /tmp/lmi/logs/log | sed -f errors.sed'
+j='./nychthemeral_test.sh'
 k='make $coefficiency install check_physical_closure 2>&1 | less -S'
 l='make $coefficiency unit_tests unit_test_targets=regex_test.exe 2>&1 | less 
-S'