From c22c87203682bb983220cde0be4da0d5995fd502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Sat, 5 Mar 2022 19:31:01 +0100 Subject: [PATCH] tests: don't always skip zfs_unshare tests on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, they'd all be skipped on FreeBSD where share is showmount Reviewed-by: Brian Behlendorf Reviewed-by: John Kennedy Reviewed-by: Ryan Moeller Signed-off-by: Ahelenia Ziemiańska Closes #13259 --- .../functional/cli_root/zfs_unshare/setup.ksh | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-) mode change 100755 => 120000 tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh deleted file mode 100755 index 29f38e802c..0000000000 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/ksh -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -. $STF_SUITE/include/libtest.shlib - -share -s -if [ $? -ne 0 ]; then - log_unsupported "The NFS utilities are not installed" -fi - -# Make sure NFS server is running before testing. -setup_nfs_server - -DISK=${DISKS%% *} -default_container_volume_setup $DISK diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh new file mode 120000 index 0000000000..b5208415d4 --- /dev/null +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/setup.ksh @@ -0,0 +1 @@ +../zfs_share/setup.ksh \ No newline at end of file