[lmi-commits] [lmi] master 37df05f 5/6: Prefer '_' to '-' in log file names

[Greg Chicares]

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

    Prefer '_' to '-' in log file names
    
    Reason: '-' is often interpreted as separating words.
    
    Incidentally reworded 'INSTALL', most notably because "about an hour"
    has become about five minutes per architecture, given enough cores.
---
 INSTALL              | 17 +++++++++--------
 gui_test.sh          |  2 +-
 nychthemeral_test.sh | 10 +++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/INSTALL b/INSTALL
index 044ab62..99a23a6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,8 +57,8 @@ Close the "Command prompt" window.
 
 (2) Install lmi
 
-[Experienced users: Make sure 'C:\cache_for_lmi\' contains any files
-you need to download manually due to corporate firewall weirdness.]
+[Experienced users: Make sure 'C:\cache_for_lmi\' contains any files you
+need to download manually due to corporate firewall weirdness.]
 
 Start a Cygwin shell:
 
@@ -72,15 +72,16 @@ Copy the following, and paste it (Shift-Insert) into the 
shell:
   cd /tmp
   wget -N $install_script
   chmod +x install_msw.sh
-  logfile=log-`date -u +'%Y%m%dT%H%MZ'`; echo "Log file is '$logfile.tar.bz2'."
+  logfile=log_`date -u +'%Y%m%dT%H%MZ'`; echo "Log file is '$logfile.tar.bz2'."
   ./install_msw.sh >$logfile 2>&1; tar -cjf $logfile.tar.bz2 $logfile
 
-Installation proceeds silently for about an hour. When you see
-"Finished building lmi", copy and paste these lines into the shell:
+Installation proceeds silently for anywhere from a few minutes to a couple
+of hours, depending on your computer. When you see "Finished building lmi",
+copy and paste these lines into the shell:
 
   export PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$PATH
   cd /opt/lmi/bin; ./lmi_wx_shared --data_path=/opt/lmi/data
 
-You should see lmi's GUI. Try "File | New | Illustration", then press
-"OK"; you should see values. Then try "File | Print preview". You
-should see an illustration in your 'pdf' viewer.
+You should see lmi's GUI. Try "File | New | Illustration", then press "OK";
+you should see values. Then try "File | Print preview"; you should see an
+illustration in your 'pdf' viewer.
diff --git a/gui_test.sh b/gui_test.sh
index 5c90ecf..727dcab 100755
--- a/gui_test.sh
+++ b/gui_test.sh
@@ -142,4 +142,4 @@ mkdir --parents /tmp/lmi/logs
 
 cd /opt/lmi/src/lmi
 
-"$PERFORM" /opt/lmi/bin/wx_test --ash_nazg --data_path=/opt/lmi/data 2>&1 | 
tee /tmp/lmi/logs/gui-test | sed -e "$gui_test_clutter"
+"$PERFORM" /opt/lmi/bin/wx_test --ash_nazg --data_path=/opt/lmi/data 2>&1 | 
tee /tmp/lmi/logs/gui_test | sed -e "$gui_test_clutter"
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 5f1643c..8c6f616 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -121,15 +121,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 \
@@ -137,11 +137,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 \