lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 10256f5 05/14: Use set_toolchain.sh in the co


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 10256f5 05/14: Use set_toolchain.sh in the coding rules test script
Date: Sat, 10 Oct 2020 11:07:11 -0400 (EDT)

branch: master
commit 10256f57063015a5aa8b9051713eac8493d3dade
Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Use set_toolchain.sh in the coding rules test script
    
    Use set_toolchain.sh to correctly determine `PERFORM` variable for the 
native
    Linux build.
---
 test_coding_rules_test.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/test_coding_rules_test.sh b/test_coding_rules_test.sh
index 35ae0b2..d3fa399 100755
--- a/test_coding_rules_test.sh
+++ b/test_coding_rules_test.sh
@@ -29,6 +29,15 @@
 
 echo "Testing 'test_coding_rules'."
 
+# Directory where this script resides.
+
+srcdir=$(dirname "$(readlink --canonicalize "$0")")
+
+# Cannot recursively check script on path determined at runtime, so
+# a directive like 'source="$srcdir"' doesn't work.
+# shellcheck disable=SC1090
+. "$srcdir"/set_toolchain.sh
+
 rm --force eraseme*
 
 # Boilerplate required in most files.
@@ -371,16 +380,6 @@ touch another.unexpected.file
 
 # Compare observed to expected. Note that directory '.' is ignored.
 
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
-case "$lmi_build_type" in
-    (*-*-linux*)
-        PERFORM=wine
-        ;;
-    (*)
-        PERFORM=
-        ;;
-esac
-
 2>&1 $PERFORM ./test_coding_rules \
   . \
   a_nonexistent_file \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]