[lmi-commits] [lmi] master bcfffdd 5/7: Use an ELF 'test_coding_rules' regardless of $LMI_TRIPLET

[Greg Chicares]

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

    Use an ELF 'test_coding_rules' regardless of $LMI_TRIPLET
---
 .github/workflows/ci.yml |  2 +-
 GNUmakefile              |  2 ++
 gwc/develop1.txt         |  2 +-
 hooks/pre-commit         |  8 +++++++-
 nychthemeral_test.sh     | 12 +++++++++---
 tabs/4/startup_script    |  2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1fa238c..85b14f6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -315,7 +315,7 @@ jobs:
           # Somehow these files are executable and this triggers complaints
           # from check_script.sh, so avoid them by fixing permissions.
           chmod -x .git/info/exclude .git/description
-          make $coefficiency check_concinnity
+          make $coefficiency LMI_COMPILER=gcc LMI_TRIPLET=x86_64-pc-linux-gnu 
check_concinnity
 
           make $coefficiency check_physical_closure
 
diff --git a/GNUmakefile b/GNUmakefile
index f08c70e..1aaf431 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -435,6 +435,8 @@ TEST_CODING_RULES := $(build_dir)/test_coding_rules$(EXEEXT)
 
 .PHONY: custom_tools
 custom_tools:
+       @[ "$$LMI_TRIPLET" = "x86_64-pc-linux-gnu" ] \
+         || ($(ECHO) "'$@' requires x86_64-pc-linux-gnu." && false)
        @$(MAKE) test_coding_rules$(EXEEXT)
        @$(INSTALL) -c -m 0775 $(TEST_CODING_RULES) $(localbindir)
 
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index 48086d7..7478bf5 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -289,7 +289,7 @@ pushd /tmp; /opt/lmi/src/lmi/test_schemata.sh 
>/opt/lmi/src/log 2>&1; popd
 
 cd /opt/lmi/src/lmi
 
-make $coefficiency check_concinnity >../log 2>&1
+make $coefficiency LMI_COMPILER=gcc LMI_TRIPLET=x86_64-pc-linux-gnu 
check_concinnity >../log 2>&1
 sed -f diagnostics.sed ../log 2>&1 |less -S
 
   # Fifth screen: only for running lmi and its GUI tests
diff --git a/hooks/pre-commit b/hooks/pre-commit
index c257a1f..f8edd5a 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -25,9 +25,15 @@ set -e
 
 check_concinnity()
 {
-    make custom_tools --directory=/opt/lmi/src/lmi >/dev/null 2>&1
+    make \
+      LMI_COMPILER=gcc \
+      LMI_TRIPLET=x86_64-pc-linux-gnu \
+      custom_tools \
+      --directory=/opt/lmi/src/lmi >/dev/null 2>&1
     output=$( \
         make \
+          LMI_COMPILER=gcc \
+          LMI_TRIPLET=x86_64-pc-linux-gnu \
           prefascicle_dir="$1" \
           --directory=/opt/lmi/src/lmi \
           --no-print-directory \
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 90a3c9a..b617236 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -128,6 +128,7 @@ nychthemeral_clutter='
 /^  *[1-9][0-9]* source files/d
 /^  *[1-9][0-9]* source lines/d
 /^  *[1-9][0-9]* marked defects/d
+/^# concinnity test skipped--it uses POSIX only/d
 /^# speed test/d
 /^# xrc tests/d
 /^# test all valid emission types/d
@@ -184,9 +185,14 @@ cd /opt/lmi/src/lmi
 make "$coefficiency" uninstall 2>&1 \
   | tee "$log_dir"/uninstall | sed -e "$build_clutter" -e "$uninstall_clutter"
 
-printf '\n# test concinnity\n\n'
-make "$coefficiency" check_concinnity 2>&1 \
-  | tee "$log_dir"/concinnity | sed -e "$build_clutter" -e 
"$concinnity_clutter"
+if [ "x86_64-pc-linux-gnu" = "$LMI_TRIPLET" ]
+then
+  printf '\n# test concinnity\n\n'
+  make "$coefficiency" check_concinnity 2>&1 \
+    | tee "$log_dir"/concinnity | sed -e "$build_clutter" -e 
"$concinnity_clutter"
+else
+  printf '\n# concinnity test skipped--it uses POSIX only\n\n'
+fi
 
 printf '# install; check physical closure\n\n'
 make "$coefficiency" install check_physical_closure 2>&1 \
diff --git a/tabs/4/startup_script b/tabs/4/startup_script
index 3bb1846..54e6a25 100755
--- a/tabs/4/startup_script
+++ b/tabs/4/startup_script
@@ -3,7 +3,7 @@
 a='schroot --chroot=lmi'
 
 b='cd /opt/lmi/src/lmi'
-d='make $coefficiency check_concinnity 2>&1 |less -S -N'
+d='make $coefficiency LMI_COMPILER=gcc LMI_TRIPLET=x86_64-pc-linux-gnu 
check_concinnity 2>&1 |less -S -N'
 e='sed -f diagnostics.sed ../log 2>&1 |less -S'
 f='pushd /tmp; /opt/lmi/src/lmi/test_schemata.sh 2>&1 |less; popd'