[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 7ef9543 7/8: Rename a local variable
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 7ef9543 7/8: Rename a local variable |
Date: |
Wed, 17 Apr 2019 06:20:19 -0400 (EDT) |
branch: master
commit 7ef95438e6fb3e7ec4b873ca1efdc35f9f8de091
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename a local variable
Changed $logdir to $log_dir, which is more readable and follows lmi
practice elsewhere (except for variables specified in the GNU Coding
Standards, such as $bindir).
---
nychthemeral_test.sh | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 1e65d6c..83b8e52 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -103,8 +103,8 @@ schemata_clutter='
'
# Directory for test logs.
-logdir=/tmp/lmi/logs
-mkdir --parents "$logdir"
+log_dir=/tmp/lmi/logs
+mkdir --parents "$log_dir"
cd /opt/lmi/src/lmi
@@ -112,30 +112,30 @@ printf '\n# test concinnity\n\n'
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
"$logdir"/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
"$logdir"/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 "$logdir"/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')
>"$logdir"/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
"$logdir"/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 "$logdir"/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') >"$logdir"/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
"$logdir"/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 +155,7 @@ 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 "$logdir"/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 (7448016 -> 7515165), Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master 3b11a29 3/8: Don't export variables not used by any child process, Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master b978a73 4/8: Restrict $PATH to a hardcoded minimum in 'install_msw.sh', Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master 010fac0 5/8: Optionally inhibit (re)cloning lmi from git in 'install_msw.sh', Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master 7515165 8/8: Add a more radical alternative to 'clobber', Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master 373ebe5 1/8: Update PETE for gcc-8.x, Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master 7ef9543 7/8: Rename a local variable,
Greg Chicares <=
- [lmi-commits] [lmi] master ec9f2e2 2/8: Improve documentation, Greg Chicares, 2019/04/17
- [lmi-commits] [lmi] master 7c8467c 6/8: Inhibit (re)cloning lmi into lmi srcdir, Greg Chicares, 2019/04/17