[lmi-commits] [lmi] master a4cae8ed 05/10: Transplant the last revision

[Greg Chicares]

branch: master
commit a4cae8ed42fc4ef424e204969e4e7c6360330b0e
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Transplant the last revision
    
    Manually "reverted" the last revision:
      git show 5675763ae -- gwc/unit_test.sh | git apply --reverse
    and moved the changes "reverted" in one file into another.
    
    A whitespace change will follow presently, as a separate commit
    because --ignore-all-space and color-moved=plain don't work as
    well in combination as they do separately, alas.
---
 gwc/unit_test.sh     | 30 ------------------------------
 nychthemeral_test.sh | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/gwc/unit_test.sh b/gwc/unit_test.sh
index 93680c1f..17095564 100755
--- a/gwc/unit_test.sh
+++ b/gwc/unit_test.sh
@@ -1,14 +1,5 @@
 #!/bin/zsh
 
-unit_test_stderr_clutter='
-/.*\/test_coding_rules_test\.sh$/d
-/^Testing .test_coding_rules.\.$/d
-/^  This message should appear on stderr\.$/d
-/^Integrity check failed for .coleridge.$/d
-/^Please report this: culminate() not called\.$/d
-/^sh: 1: xyzzy: not found$/d
-'
-
 # 'triplets' really is used, but in a zsh-specific way
 # shellcheck disable=SC2034
   triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32"
@@ -29,27 +20,6 @@ printf 'LMI_TRIPLET = "%s"\n' "$LMI_TRIPLET" > /dev/tty
     >(grep \?\?\?\?) \
     >(grep '!!!!' --count | xargs printf '%d tests succeeded\n') \
     >"$log_dir"/unit_tests
-  if [ "x86_64-pc-linux-gnu" = "$LMI_TRIPLET" ]
-  then
-    printf '\n  unit tests with UBSan\n\n'
-    # shellcheck disable=SC3001
-    (setopt nomultios; \
-      ( \
-        (make "$coefficiency" --output-sync=recurse unit_tests \
-          build_type=ubsan UBSAN_OPTIONS=print_stacktrace=1 \
-        | tee \
-          >(grep '\*\*\*') \
-          >(grep \?\?\?\?) \
-          >(grep '!!!!' --count | xargs printf '%d tests succeeded\n') \
-        >"$log_dir"/unit_tests_ubsan_stdout \
-        ) \
-        3>&1 1>&2 2>&3 \
-        | tee "$log_dir"/unit_tests_ubsan_stderr \
-          | sed -e "$unit_test_stderr_clutter" \
-          | sed -e's/^/UBSan: /' \
-      ) 3>&1 1>&2 2>&3 \
-    );
-  fi
 }
 printf "\n  Done.\n"
 done
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 53da8dca..1d661b79 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -187,6 +187,15 @@ cli_cgi_clutter='
 /^  0 errors$/d
 '
 
+unit_test_stderr_clutter='
+/.*\/test_coding_rules_test\.sh$/d
+/^Testing .test_coding_rules.\.$/d
+/^  This message should appear on stderr\.$/d
+/^Integrity check failed for .coleridge.$/d
+/^Please report this: culminate() not called\.$/d
+/^sh: 1: xyzzy: not found$/d
+'
+
 schemata_clutter='
 /^  Test cell-subelement sorting\.$/d
 /^  Test schemata\.\.\.$/d
@@ -227,6 +236,8 @@ nychthemeral_clutter='
 /^Test sample.cns:/d
 /^Test sample.ill:/d
 /^# unit tests in libstdc++ debug mode/d
+/^# unit tests with UBSan/d
+/^# ubsan tests skipped--used with POSIX only/d
 /^[1-9][0-9]* tests succeeded/d
 /^# test concinnity/d
 /^  Problems detected by xmllint:/d
@@ -351,6 +362,30 @@ printf '\n# unit tests in libstdc++ debug mode\n\n'
 make "$coefficiency" --output-sync=recurse unit_tests build_type=safestdlib 
2>&1 \
   | tee >(grep '\*\*\*') >(grep \?\?\?\?) >(grep '!!!!' --count | xargs printf 
'%d tests succeeded\n') >"$log_dir"/unit_tests_safestdlib
 
+  if [ "x86_64-pc-linux-gnu" = "$LMI_TRIPLET" ]
+  then
+    printf '\n# unit tests with UBSan\n\n'
+    # shellcheck disable=SC3001
+    (setopt nomultios; \
+      ( \
+        (make "$coefficiency" --output-sync=recurse unit_tests \
+          build_type=ubsan UBSAN_OPTIONS=print_stacktrace=1 \
+        | tee \
+          >(grep '\*\*\*') \
+          >(grep \?\?\?\?) \
+          >(grep '!!!!' --count | xargs printf '%d tests succeeded\n') \
+        >"$log_dir"/unit_tests_ubsan_stdout \
+        ) \
+        3>&1 1>&2 2>&3 \
+        | tee "$log_dir"/unit_tests_ubsan_stderr \
+          | sed -e "$unit_test_stderr_clutter" \
+          | sed -e's/^/UBSan: /' \
+      ) 3>&1 1>&2 2>&3 \
+    );
+  else
+    printf '\n# ubsan tests skipped--used with POSIX only\n\n'
+  fi
+
 if [ "greg" = "$(whoami)" ]
 then
   printf '\n# speed test\n\n'