Merge pull request #4463 from grandixximo/tcl-skip-detect-fix

tests: detect Tcl HAL extensions functionally in skip scripts

Author: BsAtHome

tests/tclsh-extensions/skip

@@ -1,17 +1,17 @@
 #!/bin/bash
-# This test exercises the Tcl HAL extensions (tcl/hal.so,
-# tcl/linuxcnc.so), which are only built in GUI builds (BUILD_GUI);
-# skip in headless builds.  The tcl dir is taken from TCLLIBPATH
-# (exported by rip-environment).
+# This test needs the Tcl HAL extensions, only built in GUI builds.
+# Ask tclsh to load them like the test does; works for run-in-place
+# (TCLLIBPATH) and installed packages (auto_path).  catch is needed
+# because tclsh reads stdin interactively and exits 0 even on error.
 set -u
 
 if ! command -v tclsh >/dev/null 2>&1; then
     echo "skip: tclsh not installed" >&2
     exit 1
 fi
 
-read -r tcldir _ <<< "${TCLLIBPATH:-}"
-if ! [ -f "${tcldir:-/nonexistent}/linuxcnc.so" ]; then
+if ! echo 'exit [catch {package require Linuxcnc
+package require Hal}]' | tclsh >/dev/null 2>&1; then
     echo "skip: Tcl HAL extensions not built (headless build)" >&2
     exit 1
 fi

tests/twopass-personality/skip

@@ -1,16 +1,16 @@
 #!/bin/bash
-# haltcl needs the Tcl HAL extension (tcl/hal.so), which is only built
-# in GUI builds (BUILD_GUI); skip in headless builds.  The tcl dir is
-# taken from TCLLIBPATH (exported by rip-environment).
+# haltcl needs the Tcl HAL extension, only built in GUI builds.  Ask
+# tclsh to load it like the test does; works for run-in-place
+# (TCLLIBPATH) and installed packages (auto_path).  catch is needed
+# because tclsh reads stdin interactively and exits 0 even on error.
 set -u
 
 if ! command -v tclsh >/dev/null 2>&1; then
     echo "skip: tclsh not installed" >&2
     exit 1
 fi
 
-read -r tcldir _ <<< "${TCLLIBPATH:-}"
-if ! [ -f "${tcldir:-/nonexistent}/hal.so" ]; then
+if ! echo 'exit [catch {package require Hal}]' | tclsh >/dev/null 2>&1; then
     echo "skip: Tcl HAL extension not built (headless build)" >&2
     exit 1
 fi

tests/twopass/skip

@@ -1,16 +1,16 @@
 #!/bin/bash
-# haltcl needs the Tcl HAL extension (tcl/hal.so), which is only built
-# in GUI builds (BUILD_GUI); skip in headless builds.  The tcl dir is
-# taken from TCLLIBPATH (exported by rip-environment).
+# haltcl needs the Tcl HAL extension, only built in GUI builds.  Ask
+# tclsh to load it like the test does; works for run-in-place
+# (TCLLIBPATH) and installed packages (auto_path).  catch is needed
+# because tclsh reads stdin interactively and exits 0 even on error.
 set -u
 
 if ! command -v tclsh >/dev/null 2>&1; then
     echo "skip: tclsh not installed" >&2
     exit 1
 fi
 
-read -r tcldir _ <<< "${TCLLIBPATH:-}"
-if ! [ -f "${tcldir:-/nonexistent}/hal.so" ]; then
+if ! echo 'exit [catch {package require Hal}]' | tclsh >/dev/null 2>&1; then
     echo "skip: Tcl HAL extension not built (headless build)" >&2
     exit 1
 fi