[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master ab5aea2 2/6: Reformat 'nychthemeral_test.sh'
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master ab5aea2 2/6: Reformat 'nychthemeral_test.sh' |
Date: |
Sun, 21 Apr 2019 12:29:03 -0400 (EDT) |
branch: master
commit ab5aea254c103bdf817e90026cf1a7746acce883
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Reformat 'nychthemeral_test.sh'
Split command lines after '2>&1' to make structure clearer.
Best reviewed with '--word-diff'.
---
nychthemeral_test.sh | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 83b8e52..b90e5d5 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -109,33 +109,42 @@ mkdir --parents "$log_dir"
cd /opt/lmi/src/lmi
printf '\n# test concinnity\n\n'
-make "$coefficiency" check_concinnity 2>&1 | sed -e "$build_clutter" -e
"$concinnity_clutter"
+make "$coefficiency" check_concinnity 2>&1 \
+ | sed -e "$build_clutter" -e "$concinnity_clutter"
printf '# install; check physical closure\n\n'
-make "$coefficiency" install check_physical_closure 2>&1 | tee
"$log_dir"/install | sed -e "$build_clutter" -e "$install_clutter"
+make "$coefficiency" install check_physical_closure 2>&1 \
+ | tee "$log_dir"/install | sed -e "$build_clutter" -e "$install_clutter"
printf 'Production system built--ready to start GUI test in another
session.\n' > /dev/tty
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"
+make "$coefficiency" --output-sync=recurse cgi_tests cli_tests 2>&1 \
+ | 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"
+make "$coefficiency" system_test 2>&1 \
+ | 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
+make "$coefficiency" unit_tests 2>&1 \
+ | 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 | tee
"$log_dir"/so_test | sed -e "$build_clutter"
+make "$coefficiency" all build_type=so_test USE_SO_ATTRIBUTES=1 2>&1 \
+ | tee "$log_dir"/so_test | sed -e "$build_clutter"
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"
+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"
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
+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
printf '\n# xrc tests\n\n'
-java -jar /opt/lmi/third_party/rng/jing.jar -c xrc.rnc *.xrc 2>&1 | tee
"$log_dir"/xrc
+java -jar /opt/lmi/third_party/rng/jing.jar -c xrc.rnc *.xrc 2>&1 \
+ | tee "$log_dir"/xrc
# Run the following tests in a throwaway directory so that the files
# they create can be cleaned up easily.
@@ -155,7 +164,8 @@ printf '\n# test all valid emission types\n\n'
"$PERFORM" /opt/lmi/bin/lmi_cli_shared --file=/tmp/lmi/tmp/sample.cns --accept
--ash_nazg --data_path=/opt/lmi/data
--emit=emit_test_data,emit_spreadsheet,emit_group_roster,emit_text_stream,emit_custom_0,emit_custom_1
>/dev/null
printf '\n# schema tests\n\n'
-/opt/lmi/src/lmi/test_schemata.sh 2>&1 | tee "$log_dir"/schemata | sed -e
"$schemata_clutter"
+/opt/lmi/src/lmi/test_schemata.sh 2>&1 \
+ | tee "$log_dir"/schemata | sed -e "$schemata_clutter"
# Clean up stray output. (The zsh '(N)' glob qualifier turns on
# null_glob for a single expansion.)
- [lmi-commits] [lmi] master updated (4a4bad9 -> aff817a), Greg Chicares, 2019/04/21
- [lmi-commits] [lmi] master e46be46 1/6: Allow another gcc-8.x version, Greg Chicares, 2019/04/21
- [lmi-commits] [lmi] master ab5aea2 2/6: Reformat 'nychthemeral_test.sh',
Greg Chicares <=
- [lmi-commits] [lmi] master 37df05f 5/6: Prefer '_' to '-' in log file names, Greg Chicares, 2019/04/21
- [lmi-commits] [lmi] master 6fcb4d8 3/6: Make 'nychthemeral_test.sh' more robust, Greg Chicares, 2019/04/21
- [lmi-commits] [lmi] master e819f44 4/6: Make 'nychthemeral_test.sh' filter its output, Greg Chicares, 2019/04/21
- [lmi-commits] [lmi] master aff817a 6/6: Fold 'errors.sed' into 'nychthemeral_test.sh', Greg Chicares, 2019/04/21