[lmi-commits] [lmi] odd/multiarch 6690110 1/7: Make $test_dir a subdirectory of $prefix, not of $exec_prefix

[Greg Chicares]

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

    Make $test_dir a subdirectory of $prefix, not of $exec_prefix
    
    System-test results do in fact differ between 32- and 64-bit msw builds.
    It's not yet clear whether that's a natural phenomenon or a defect, but
    it is certain that only one architecture can be supported in production.
    There must be one unique touchstone for system tests, and it must match
    the results generated by the production system. The only real use for
    comparing 64-bit binaries to the current 32-bit touchstone is acceptance
    testing for a 64-bit production release; there's no need to maintain two
    sets of test results as a matter of routine.
    
    Accordingly, 'nychthemeral_test.sh' should not run 'make system_test'
    for any architecture other than the one used in production.
---
 GNUmakefile          | 11 ++---------
 install_msw.sh       | 14 --------------
 nychthemeral_test.sh | 11 ++++++++---
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 0385750..4708cbd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -121,15 +121,8 @@ srcdir          := $(CURDIR)
 localbindir     := $(exec_prefix)/local/bin
 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. 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
+test_dir        := $(prefix)/test
+touchstone_dir  := $(prefix)/touchstone
 
 
################################################################################
 
diff --git a/install_msw.sh b/install_msw.sh
index 028d429..e1e878b 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -208,20 +208,6 @@ 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
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 1519763..52a4d70 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -147,9 +147,14 @@ 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"
 
-printf '\n# system test\n\n'
-make "$coefficiency" system_test 2>&1 \
-  | tee "$log_dir"/system_test | sed -e "$build_clutter" -e "$install_clutter"
+if [ "i686-w64-mingw32" = "$LMI_HOST" ]
+then
+  printf '\n# system test\n\n'
+  make "$coefficiency" system_test 2>&1 \
+    | tee "$log_dir"/system_test | sed -e "$build_clutter" -e 
"$install_clutter"
+else
+  printf '\n# system test skipped--it succeeds only with the production 
architecture\n\n'
+fi
 
 printf '\n# unit tests\n\n'
 make "$coefficiency" unit_tests 2>&1 \