tests: Avoid accidental matching of the vendor field of $host, part 2

* tests/local.mk (TESTS_ENVIRONMENT): Remove host_triplet.
* tests/chgrp/basic.sh: Use $host_os instead of $host_triplet.
* tests/misc/io-errors.sh: Likewise.

diff --git a/tests/chgrp/basic.sh b/tests/chgrp/basic.sh
index 1d8715efea7d3bc21f6bd74f6e30f453bfb225e7..4a1dabe628831686a6bc5d7e6669bc365a34b214 100755 (executable)
--- a/tests/chgrp/basic.sh
+++ b/tests/chgrp/basic.sh
@@ -102,7 +102,7 @@ test "$(ls -C -c -t f g)" = 'f  g' || \
       openbsd*) echo ignoring known OpenBSD-specific chgrp failure 1>&2 ;;
       darwin7.9.*|darwin8.*)
         echo ignoring known MacOS X-specific chgrp failure 1>&2 ;;
-      *) echo $host_triplet: no-change chgrp failed to update ctime 1>&2;
+      *) echo $host_os: no-change chgrp failed to update ctime 1>&2;
             fail=1 ;;
     esac
   }

diff --git a/tests/local.mk b/tests/local.mk
index 74b77f220e92a1827b61e49d41ae4264543f8df7..628e54436d5384914d092dc706c0f5f264a4bd01 100644 (file)
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -68,7 +68,6 @@ TESTS_ENVIRONMENT =                           \
   built_programs='$(built_programs) $(single_binary_progs)' \
   fail=0                                       \
   host_os=$(host_os)                           \
-  host_triplet='$(host_triplet)'               \
   srcdir='$(srcdir)'                           \
   top_srcdir='$(top_srcdir)'                   \
   CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \

diff --git a/tests/misc/io-errors.sh b/tests/misc/io-errors.sh
index 72bfeb458455c9563a9fc3e969725394a6b3a60e..75f50050f854677219f89d8948424a927cce3099 100755 (executable)
--- a/tests/misc/io-errors.sh
+++ b/tests/misc/io-errors.sh
@@ -88,7 +88,7 @@ while read writer; do
   # As a result, when we print a single line there is no bytes buffered when
   # we close the stream and errno is not set.  See:
   # <https://www.openwall.com/lists/musl/2026/04/02/1>.
-  case $host_triplet in
+  case $host_os in
     *-musl*) error_re="$error_re|" ;;
   esac