[lmi-commits] [lmi] odd/multiarch c436fbd 1/3: Move and expand some system-testing ideas

[Greg Chicares]

branch: odd/multiarch
commit c436fbddbc84820424e97993f9096887916fddd1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Move and expand some system-testing ideas
---
 GNUmakefile    |  6 +++++-
 install_msw.sh | 18 ++++++++++++++++--
 workhorse.make |  6 ------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 81062bc..13daed3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -123,7 +123,11 @@ locallibdir     := $(exec_prefix)/local/lib
 localincludedir := $(exec_prefix)/local/include
 # Presuppose that system-test results may legitimately vary by
 # architecture. If experience shows otherwise, then these should
-# become subdirectories of $(prefix) instead.
+# become subdirectories of $(prefix) instead. Perhaps
+#   $(prefix)/{test,touchstone}/$(LMI_HOST)
+# would be better, because 'rm -rf ./"$exec_prefix"' shouldn't remove
+# architecture-dependent test results, only binaries--i.e., test
+# results should be immune to 'make raze'.
 test_dir        := $(exec_prefix)/test
 touchstone_dir  := $(exec_prefix)/touchstone
 
diff --git a/install_msw.sh b/install_msw.sh
index 843dc5f..5404845 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -197,7 +197,7 @@ make $coefficiency --output-sync=recurse -f 
install_miscellanea.make
 
 # This for-loop can iterate over as many architectures as desired.
 export LMI_HOST
-for LMI_HOST in i686-w64-mingw32 x86_64-w64-mingw32
+for LMI_HOST in i686-w64-mingw32 x86_64-w64-mingw32 ;
 do
     make $coefficiency --output-sync=recurse -f install_libxml2_libxslt.make
 
@@ -208,6 +208,20 @@ do
 
     . ./set_arch.sh
 
+    # Some experimental ideas for system testing:
+    if [ -d /opt/lmi/proprietary/test ]; then
+        mkdir -p /opt/lmi/"$LMI_HOST"/test
+        cp -a /opt/lmi/proprietary/test/* /opt/lmi/"$LMI_HOST"/test
+        mkdir -p /opt/lmi/"$LMI_HOST"/touchstone
+        cp -a /opt/lmi/proprietary/touchstone/* /opt/lmi/"$LMI_HOST"/touchstone
+    fi
+    if [ -f /opt/lmi/"$LMI_HOST"/touchstone ]; then
+        cp -a /opt/lmi/"$LMI_HOST"/test/* /opt/lmi/"$LMI_HOST"/touchstone
+        rm /opt/lmi/"$LMI_HOST"/touchstone/analysis-*
+        rm /opt/lmi/"$LMI_HOST"/touchstone/diffs-*
+        rm /opt/lmi/"$LMI_HOST"/touchstone/md5sums-*
+    fi
+
     make $coefficiency --output-sync=recurse wx_config_check
     make $coefficiency --output-sync=recurse show_flags
     make $coefficiency --output-sync=recurse clean
@@ -233,7 +247,7 @@ printf '5fc68a795c9c60da1b32be989efc299a  expiry\n' 
>/opt/lmi/data/validated.md5
 printf '391daa5cbc54e118c4737446bcb84eea'           >/opt/lmi/data/passkey
 
 # Surrogates for proprietary graphics:
-for z in company_logo.png group_quote_banner.png ; \
+for z in company_logo.png group_quote_banner.png ;
   do cp --archive /opt/lmi/src/lmi/gwc/$z /opt/lmi/data/ ;
 done
 
diff --git a/workhorse.make b/workhorse.make
index 6be36d1..541e676 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1449,12 +1449,6 @@ dot_test_files =
 %.cns: dot_test_files = $(basename $(notdir $@)).*test
 %.ill: dot_test_files = $(basename $(notdir $@)).*test
 
-# If no testdecks are found, do something like this:
-# cp -a /opt/lmi/proprietary/test/* /opt/lmi/i686-w64-mingw32/test
-# cp -a /opt/lmi/proprietary/test/* /opt/lmi/i686-w64-mingw32/touchstone
-# cp -a /opt/lmi/proprietary/test/* /opt/lmi/x86_64-w64-mingw32/test
-# cp -a /opt/lmi/proprietary/test/* /opt/lmi/x86_64-w64-mingw32/touchstone
-
 # This must be a 'make' variable so that the targets it contains can
 # be made PHONY.
 #