[lmi-commits] [lmi] odd/multiarch 3a53abb 6/6: Merge remote-tracking branch 'origin/master' into odd/multiarch

[Greg Chicares]

branch: odd/multiarch
commit 3a53abbff6a9ed688ab29bb023067bb5026460e0
Merge: 532daba aff817a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge remote-tracking branch 'origin/master' into odd/multiarch
---
 errors.sed            | 50 --------------------------------------------------
 gui_test.sh           |  2 +-
 nychthemeral_test.sh  | 44 ++++++++++++++++++++++++++++++++++++++------
 tabs/3/startup_script |  2 +-
 4 files changed, 40 insertions(+), 58 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/gui_test.sh b/gui_test.sh
index ef0f19d..19a07e0 100755
--- a/gui_test.sh
+++ b/gui_test.sh
@@ -145,4 +145,4 @@ cd /opt/lmi/src/lmi
 # Would sourcing 'set_arch.sh' here:
 # . ./set_arch.sh
 # be a good idea?
-"$PERFORM" /opt/lmi/"$LMI_HOST"/bin/wx_test --ash_nazg 
--data_path=/opt/lmi/data 2>&1 | tee /tmp/lmi/"$LMI_HOST"/logs/gui-test | sed 
-e "$gui_test_clutter"
+"$PERFORM" /opt/lmi/"$LMI_HOST"/bin/wx_test --ash_nazg 
--data_path=/opt/lmi/data 2>&1 | tee /tmp/lmi/"$LMI_HOST"/logs/gui_test | sed 
-e "$gui_test_clutter"
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 58fd8ba..1519763 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -94,6 +94,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/"$LMI_HOST"/logs
 mkdir --parents "$log_dir"
@@ -113,15 +145,15 @@ printf 'Production system built--ready to start GUI test 
in another session.\n'
 
 printf '\n# cgi and cli tests\n\n'
 make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 2>&1 \
-  | tee "$log_dir"/cgi-cli | sed -e "$build_clutter" -e "$cli_cgi_clutter"
+  | tee "$log_dir"/cgi_cli | sed -e "$build_clutter" -e "$cli_cgi_clutter"
 
 printf '\n# system test\n\n'
 make "$coefficiency" system_test 2>&1 \
-  | tee "$log_dir"/system-test | sed -e "$build_clutter" -e "$install_clutter"
+  | tee "$log_dir"/system_test | sed -e "$build_clutter" -e "$install_clutter"
 
 printf '\n# unit tests\n\n'
 make "$coefficiency" unit_tests 2>&1 \
-  | tee >(grep '\*\*\*') >(grep \?\?\?\?) >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >"$log_dir"/unit-tests
+  | tee >(grep '\*\*\*') >(grep \?\?\?\?) >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >"$log_dir"/unit_tests
 
 printf '\n# build with shared-object attributes\n\n'
 make "$coefficiency" all build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 \
@@ -129,11 +161,11 @@ make "$coefficiency" all build_type=so_test 
USE_SO_ATTRIBUTES=1 2>&1 \
 
 printf '\n# cgi and cli tests in libstdc++ debug mode\n\n'
 make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 
build_type=safestdlib 2>&1 \
-  | tee "$log_dir"/cgi-cli-safestdlib | sed -e "$build_clutter" -e 
"$cli_cgi_clutter"
+  | tee "$log_dir"/cgi_cli_safestdlib | sed -e "$build_clutter" -e 
"$cli_cgi_clutter"
 
 printf '\n# unit tests in libstdc++ debug mode\n\n'
 make "$coefficiency" unit_tests build_type=safestdlib 2>&1 \
-  | tee >(grep '\*\*\*') >(grep \?\?\?\?) >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >"$log_dir"/unit-tests-safestdlib
+  | tee >(grep '\*\*\*') >(grep \?\?\?\?) >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >"$log_dir"/unit_tests_safestdlib
 
 printf '\n# xrc tests\n\n'
 java -jar /opt/lmi/third_party/rng/jing.jar -c xrc.rnc ./*.xrc 2>&1 \
@@ -168,4 +200,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'