OS-8403 smartos-test needs pkgsrc updates

Reviewed by: Jonathan Perkin <jperkin@pkgsrc.org>
Reviewed by: Travis Paul <Tr@visPaul.me>
Approved by: Brian Bennett <brian.bennett@mnx.io>

7 files changed, 14 insertions, 35 deletions

diff --git a/usr/src/test/libc-tests/runfiles/default.run b/usr/src/test/libc-tests/runfiles/default.run
index 6c225db7a1..683b08039c 100644
--- a/usr/src/test/libc-tests/runfiles/default.run
+++ b/usr/src/test/libc-tests/runfiles/default.run
@@ -102,12 +102,10 @@ timeout = 600
 [/opt/libc-tests/tests/call_once.32]
 [/opt/libc-tests/tests/call_once.64]
 [/opt/libc-tests/tests/catopen]
-[/opt/libc-tests/tests/env-OS-4089.32]
-[/opt/libc-tests/tests/env-OS-4089.64]
-[/opt/libc-tests/tests/env-7076.32]
-[/opt/libc-tests/tests/env-7076.64]
 [/opt/libc-tests/tests/endian.32]
 [/opt/libc-tests/tests/endian.64]
+[/opt/libc-tests/tests/env-OS-4089.32]
+[/opt/libc-tests/tests/env-OS-4089.64]
 [/opt/libc-tests/tests/env-7076.32]
 [/opt/libc-tests/tests/env-7076.64]
 [/opt/libc-tests/tests/fnmatch.32]
diff --git a/usr/src/test/os-tests/runfiles/default.run b/usr/src/test/os-tests/runfiles/default.run
index 52c10ac81c..e5dcabb596 100644
--- a/usr/src/test/os-tests/runfiles/default.run
+++ b/usr/src/test/os-tests/runfiles/default.run
@@ -60,10 +60,6 @@ tests = ['sigqueue_queue_size']
 user = root
 tests = ['sdevfs_eisdir']
 
-[/opt/os-tests/tests/timer]
-user = root
-tests = ['timer_limit']
-
 [/opt/os-tests/tests/tmpfs]
 user = root
 tests = ['tmpfs_badmount', 'tmpfs_enospc']
@@ -107,17 +103,6 @@ arch = i86pc
 timeout = 300
 tests = ['ldt', 'badseg']
 
-[/opt/os-tests/tests/imc_test]
-arch = i86pc
-
-#
-# Except atrparse all tests require special hardware (CCID YubiKey) to run,
-# hence they aren't included in the default runfile.
-#
-[/opt/os-tests/tests/uccid]
-arch = i86pc
-tests = ['atrparse']
-
 [/opt/os-tests/tests/writev.32]
 [/opt/os-tests/tests/writev.64]
 
diff --git a/usr/src/test/smartos-test/smartos-test.sh b/usr/src/test/smartos-test/smartos-test.sh
index c26e50ba42..007b5845e1 100755
--- a/usr/src/test/smartos-test/smartos-test.sh
+++ b/usr/src/test/smartos-test/smartos-test.sh
@@ -27,7 +27,7 @@ export PATH=/usr/bin:/usr/sbin:/opt/tools/sbin:/opt/tools/bin:$PATH
 
 # The pkgsrc packages we will install.
 export SMARTOS_TEST_PKGS="
-    python27
+    python39
     sudo
     coreutils
     gcc10
@@ -202,7 +202,7 @@ function setup_pkgsrc {
 
     # We should always use the same pkgsrc version as we have installed
     # on the build machine in case any of our tests link against libraries
-    # in /opt/local
+    # in /opt/tools
     PKGSRC_STEM="https://pkgsrc.smartos.org/packages/SmartOS/bootstrap"
     BOOTSTRAP_TAR="bootstrap-2021Q4-tools.tar.gz"
     BOOTSTRAP_SHA="c427cb1ed664fd161d8e12c5191adcae7aee68b4"
@@ -223,13 +223,6 @@ function setup_pkgsrc {
 
     # Install bootstrap kit to /opt/tools
     log_must tar -zxpf ${BOOTSTRAP_TAR} -C /
-
-    # add a symlink from /opt/local, needed by many test suites
-    if [[ ! -d /opt/local && ! -L /opt/local ]]; then
-        log_must ln -s /opt/tools /opt/local
-    else
-        log "Not forging /opt/local link"
-    fi
 }
 
 function install_required_pkgs {
diff --git a/usr/src/test/test-runner/cmd/run b/usr/src/test/test-runner/cmd/run
index bc2dc07e8e..556681b380 100644
--- a/usr/src/test/test-runner/cmd/run
+++ b/usr/src/test/test-runner/cmd/run
@@ -1,4 +1,4 @@
-#!@PYTHON@
+#!/usr/bin/env python
 
 #
 # This file and its contents are supplied under the terms of the
@@ -16,8 +16,13 @@
 # Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
 # Copyright 2019 Joyent, Inc.
 # Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2022 MNX Cloud, Inc.
 #
 
+# NOTE:  For SmartOS, the @PYTHON@ macro defaults to /opt/local, which is
+# not the case for the SmartOS global zone's pkgsrc installation (/opt/tools).
+# So use /usr/bin/env because the smartos-test script sets PATH appropriately.
+
 from __future__ import print_function
 import sys
 PY3 = sys.version_info[0] == 3
@@ -56,7 +61,7 @@ SU = '/usr/bin/su'
 if os.path.isfile('/usr/bin/sudo'):
     SUDO = '/usr/bin/sudo'
 else:
-    SUDO = '/opt/local/bin/sudo'
+    SUDO = '/opt/tools/bin/sudo'
 
 
 retcode = 0
diff --git a/usr/src/test/util-tests/runfiles/default.run b/usr/src/test/util-tests/runfiles/default.run
index 996aa85eee..362c3a49a9 100644
--- a/usr/src/test/util-tests/runfiles/default.run
+++ b/usr/src/test/util-tests/runfiles/default.run
@@ -35,7 +35,6 @@ outputdir = /var/tmp/test_results
 [/opt/util-tests/tests/libjedec_test]
 [/opt/util-tests/tests/smbios]
 
-[/opt/util-tests/tests/show-overlay-exit]
 user = root
 
 #
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
index 54761c81b7..5e272949ac 100644
--- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
+++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
@@ -17,6 +17,7 @@
 # Copyright 2019 Joyent, Inc.
 # Copyright 2021 Tintri by DDN, Inc. All rights reserved.
 # Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2022 MNX Cloud, Inc.
 #
 
 export PATH="/usr/bin"
@@ -133,7 +134,7 @@ function constrain_path
 
 	# SmartOS does not ship some required commands by default.
 	# Link to them in the package manager's namespace.
-	pkgsrc_bin=/opt/local/bin
+	pkgsrc_bin=/opt/tools/bin
 	pkgsrc_packages="sudo truncate python base64 shuf sha256sum"
 	for pkg in $pkgsrc_packages; do
 		if [[ ! -x $PATHDIR/$pkg ]]; then
diff --git a/usr/src/test/zfs-tests/runfiles/smartos.run b/usr/src/test/zfs-tests/runfiles/smartos.run
index a633ec274e..86726ab734 100644
--- a/usr/src/test/zfs-tests/runfiles/smartos.run
+++ b/usr/src/test/zfs-tests/runfiles/smartos.run
@@ -31,9 +31,6 @@ tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
     'alloc_class_013_pos']
 tags = ['functional', 'alloc_class']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_add]
-tests = ['zpool_add_010_pos', 'add-o_ashift', 'add_prop_ashift']
-
 [/opt/zfs-tests/tests/functional/atime]
 tests = ['atime_001_pos', 'atime_002_neg']
 
@@ -227,6 +224,7 @@ tests = ['zpool_001_neg', 'zpool_002_pos']
 tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
     'zpool_add_004_pos', 'zpool_add_005_pos', 'zpool_add_006_pos',
     'zpool_add_007_neg', 'zpool_add_008_neg', 'zpool_add_009_neg',
+    'zpool_add_010_pos', 'add-o_ashift', 'add_prop_ashift',
     'add_nested_replacing_spare']
 
 [/opt/zfs-tests/tests/functional/cli_root/zpool_attach]