From nobody Fri Jun 17 03:49:59 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 689F1844E80; Fri, 17 Jun 2022 03:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPQ6H2RJ9z4tXW; Fri, 17 Jun 2022 03:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655437799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4o3fU9jFKQfkmGiKbuO0eek9ZSJw8ECLK+mI5PyhVOc=; b=MaVmoJcq6EGa5w3AmTNgqECXm1TX7ExuI1KlfS8CBuVSbtTmm0YUMCH5usaY0IKFb0xT7S jE9sXigiPsiAt7eCD+GxHVJ6V6fznn9v2mkeo5YaLS+kGo9/WVzxOXfBd8s7JhnHalu3js qEfTQQzlkhWe7VKPc8IOIgcOhzWnf/ysc6i+jg4AMpgbkLPRsg1D7pBcZCW4qXRel8vmjL Sc6iqJ+V8mQw3l3YYYlSLy4N6wKDinGECzbTPr0VUEpbmvKKuR/hX9iYChdY9BNhntbDas JYHl7lJraCjymbX1IQcF7gv8+LYarQ0SsSQdVIUbOHY4ACg/LIxDRY7Lvw9EPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3342718623; Fri, 17 Jun 2022 03:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25H3nxUl026184; Fri, 17 Jun 2022 03:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25H3nxLY026183; Fri, 17 Jun 2022 03:49:59 GMT (envelope-from git) Date: Fri, 17 Jun 2022 03:49:59 GMT Message-Id: <202206170349.25H3nxLY026183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 608c97bff921 - main - stress2: Remove bsdlabel(8) from tests Reported by: mhorne Discussed with: kib List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 608c97bff921c8936eb71f4b1a177625cfa60250 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655437799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4o3fU9jFKQfkmGiKbuO0eek9ZSJw8ECLK+mI5PyhVOc=; b=anbUA+W9kBtMZNha8i2rSvjBTQsFLxixizPaCaZMxzvVxQhtMaTy2owWKSiQ6BGpbx/QTK wTXKOxLfprIoW2OrnyCnoeGP7IvKLpi3SWQ2NL4nK460DLKVpwUAINO/WXIbJo7r8ocHNs ePsxpjV9a9IWrxJlnAY0U5W6MpJrdS5ULfVpbq1cn2IyYzdbuffLOZ5qj2rO8wd7D1Q44D h5wktXOJu5Mf7qF2x5qAYaqPwGYxRu8w7zjiCeY5R6Sr7B4eJQfo9AhoYy1gOX47PArjhq wSNKvXmR/AA++MufovjR2f0iRAXPslU6fiFvheNOU5dQAiB8WaV4nOWp7kwMyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655437799; a=rsa-sha256; cv=none; b=Z5rDhhU2UlFTs3dzwqggd/RsF5I5EMaz2/UkhOnkGwpCVgFJt3bidTuDQeozYcq5UsS2UI pDNG3cVvqQLoKiYYdyF8mtwEyjHc2HdbXAnZauGib98wcXWdnQbATnhS3l9+Hn7g5AVPZI 3HWeZJb5ZUcO9eEgQusNq263JahctcyfHoIVEgX52M3lDBVfuCk97n5TBSdfeLecU22ux0 J2PJytDHCjVJE1rqnIhw9NNJ+QVy6ERBIi11rueDuFHajHmkNPh17zwq9oBdu7ZSRzAKJs BPNtyrl0aREW+dj+27absFQmxylkqhrc9VnoOqOFoWsfL89eD0Ii37iU0chC3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=608c97bff921c8936eb71f4b1a177625cfa60250 commit 608c97bff921c8936eb71f4b1a177625cfa60250 Author: Peter Holm AuthorDate: 2022-06-17 03:42:52 +0000 Commit: Peter Holm CommitDate: 2022-06-17 03:42:52 +0000 stress2: Remove bsdlabel(8) from tests Reported by: mhorne Discussed with: kib --- tools/test/stress2/default.cfg | 1 - tools/test/stress2/misc/advlock.sh | 5 ++--- tools/test/stress2/misc/audit2.sh | 7 +++---- tools/test/stress2/misc/backingstore.sh | 32 ++++++++++++++--------------- tools/test/stress2/misc/backingstore2.sh | 30 +++++++++++++-------------- tools/test/stress2/misc/backingstore3.sh | 32 ++++++++++++++--------------- tools/test/stress2/misc/badcode.sh | 7 +++---- tools/test/stress2/misc/bench.sh | 5 ++--- tools/test/stress2/misc/beneath2.sh | 5 ++--- tools/test/stress2/misc/beneath3.sh | 5 ++--- tools/test/stress2/misc/bio.sh | 5 ++--- tools/test/stress2/misc/buildworld.sh | 5 ++--- tools/test/stress2/misc/buildworld3.sh | 5 ++--- tools/test/stress2/misc/buildworld4.sh | 5 ++--- tools/test/stress2/misc/burnin.sh | 5 ++--- tools/test/stress2/misc/cmp.sh | 7 +++---- tools/test/stress2/misc/core2.sh | 5 ++--- tools/test/stress2/misc/core3.sh | 7 +++---- tools/test/stress2/misc/core4.sh | 5 ++--- tools/test/stress2/misc/core5.sh | 5 ++--- tools/test/stress2/misc/crossmp.sh | 5 ++--- tools/test/stress2/misc/crossmp10.sh | 5 ++--- tools/test/stress2/misc/crossmp11.sh | 5 ++--- tools/test/stress2/misc/crossmp3.sh | 5 ++--- tools/test/stress2/misc/crossmp4.sh | 5 ++--- tools/test/stress2/misc/crossmp5.sh | 5 ++--- tools/test/stress2/misc/crossmp8.sh | 5 ++--- tools/test/stress2/misc/crossmp9.sh | 5 ++--- tools/test/stress2/misc/dangling.sh | 5 ++--- tools/test/stress2/misc/datamove5.sh | 5 ++--- tools/test/stress2/misc/devfd.sh | 5 ++--- tools/test/stress2/misc/dfull.sh | 7 +++---- tools/test/stress2/misc/dtrace.sh | 5 ++--- tools/test/stress2/misc/execpath.sh | 5 ++--- tools/test/stress2/misc/exlock.sh | 5 ++--- tools/test/stress2/misc/ext2fs2.sh | 7 ++++--- tools/test/stress2/misc/extattr.sh | 13 ++++++------ tools/test/stress2/misc/extattr2.sh | 15 +++++++------- tools/test/stress2/misc/extattr_set_fd.sh | 5 ++--- tools/test/stress2/misc/extattrctl.sh | 13 ++++++------ tools/test/stress2/misc/ffs_blkfree.sh | 13 ++++++------ tools/test/stress2/misc/ffs_sync.sh | 5 ++--- tools/test/stress2/misc/ffs_syncvnode.sh | 5 ++--- tools/test/stress2/misc/ffs_syncvnode2.sh | 5 ++--- tools/test/stress2/misc/fifo.sh | 7 +++---- tools/test/stress2/misc/fifo2.sh | 9 ++++---- tools/test/stress2/misc/fifo3.sh | 5 ++--- tools/test/stress2/misc/flock.sh | 5 ++--- tools/test/stress2/misc/flock_open_close.sh | 9 ++++---- tools/test/stress2/misc/forkbomb.sh | 5 ++--- tools/test/stress2/misc/fragments.sh | 5 ++--- tools/test/stress2/misc/fs.sh | 9 ++++---- tools/test/stress2/misc/ftruncate2.sh | 5 ++--- tools/test/stress2/misc/fts.sh | 5 ++--- tools/test/stress2/misc/fts2.sh | 5 ++--- tools/test/stress2/misc/fts3.sh | 5 ++--- tools/test/stress2/misc/full.sh | 7 +++---- tools/test/stress2/misc/fuzz.sh | 13 ++++++------ tools/test/stress2/misc/getrandom.sh | 5 ++--- tools/test/stress2/misc/gjournal.sh | 5 ++--- tools/test/stress2/misc/holdcnt0.sh | 7 +++---- tools/test/stress2/misc/holdcnt04.sh | 7 +++---- tools/test/stress2/misc/isofs3.sh | 7 +++---- tools/test/stress2/misc/kevent11.sh | 5 ++--- tools/test/stress2/misc/kevent6.sh | 5 ++--- tools/test/stress2/misc/kevent7.sh | 9 ++++---- tools/test/stress2/misc/kevent8.sh | 5 ++--- tools/test/stress2/misc/laundry.sh | 5 ++--- tools/test/stress2/misc/linger.sh | 7 +++---- tools/test/stress2/misc/linger2.sh | 5 ++--- tools/test/stress2/misc/linger3.sh | 7 +++---- tools/test/stress2/misc/linger4.sh | 7 +++---- tools/test/stress2/misc/link.sh | 7 +++---- tools/test/stress2/misc/link2.sh | 7 +++---- tools/test/stress2/misc/lockf3.sh | 5 ++--- tools/test/stress2/misc/lockf4.sh | 5 ++--- tools/test/stress2/misc/lstat.sh | 5 ++--- tools/test/stress2/misc/mac_chkexec.sh | 9 ++++---- tools/test/stress2/misc/marcus.sh | 7 +++---- tools/test/stress2/misc/marcus2.sh | 7 +++---- tools/test/stress2/misc/marcus5.sh | 7 +++---- tools/test/stress2/misc/marcus6.sh | 7 +++---- tools/test/stress2/misc/marcus7.sh | 7 +++---- tools/test/stress2/misc/md.sh | 7 +++---- tools/test/stress2/misc/md3.sh | 5 ++--- tools/test/stress2/misc/md4.sh | 1 + tools/test/stress2/misc/md9.sh | 5 ++--- tools/test/stress2/misc/mdconfig4.sh | 1 - tools/test/stress2/misc/memguard.sh | 5 ++--- tools/test/stress2/misc/memguard2.sh | 5 ++--- tools/test/stress2/misc/memguard3.sh | 7 +++---- tools/test/stress2/misc/memguard4.sh | 5 ++--- tools/test/stress2/misc/mkfifo.sh | 5 ++--- tools/test/stress2/misc/mkfifo2c.sh | 5 ++--- tools/test/stress2/misc/mkfifo2d.sh | 5 ++--- tools/test/stress2/misc/mknod.sh | 5 ++--- tools/test/stress2/misc/mlockall5.sh | 5 ++--- tools/test/stress2/misc/mlockall6.sh | 5 ++--- tools/test/stress2/misc/mmap24.sh | 5 ++--- tools/test/stress2/misc/mmap29.sh | 5 ++--- tools/test/stress2/misc/mmap33.sh | 7 +++---- tools/test/stress2/misc/mmap4.sh | 5 ++--- tools/test/stress2/misc/mount.sh | 7 +++---- tools/test/stress2/misc/mount2.sh | 5 ++--- tools/test/stress2/misc/mountro.sh | 5 ++--- tools/test/stress2/misc/mountro2.sh | 5 ++--- tools/test/stress2/misc/mountro3.sh | 9 ++++---- tools/test/stress2/misc/mountro4.sh | 4 +++- tools/test/stress2/misc/mountu.sh | 8 ++++++-- tools/test/stress2/misc/msdos.sh | 4 +++- tools/test/stress2/misc/msdos10.sh | 4 +++- tools/test/stress2/misc/msdos11.sh | 4 +++- tools/test/stress2/misc/msdos12.sh | 4 +++- tools/test/stress2/misc/msdos13.sh | 4 +++- tools/test/stress2/misc/msdos14.sh | 4 +++- tools/test/stress2/misc/msdos2.sh | 7 +++++-- tools/test/stress2/misc/msdos3.sh | 4 +++- tools/test/stress2/misc/msdos4.sh | 4 +++- tools/test/stress2/misc/msdos5.sh | 4 +++- tools/test/stress2/misc/msdos6.sh | 4 +++- tools/test/stress2/misc/msdos7.sh | 4 +++- tools/test/stress2/misc/msdos8.sh | 4 +++- tools/test/stress2/misc/msdos9.sh | 4 +++- tools/test/stress2/misc/namecache2.sh | 9 ++++---- tools/test/stress2/misc/nbufkv.sh | 22 +++++++++----------- tools/test/stress2/misc/newfs.sh | 11 +++++----- tools/test/stress2/misc/newfs2.sh | 11 +++++----- tools/test/stress2/misc/newfs3.sh | 11 +++++----- tools/test/stress2/misc/newfs4.sh | 11 +++++----- tools/test/stress2/misc/newfs5.sh | 11 +++++----- tools/test/stress2/misc/nfs10.sh | 5 ++--- tools/test/stress2/misc/nfs11.sh | 5 ++--- tools/test/stress2/misc/nfs18.sh | 4 +++- tools/test/stress2/misc/nfs2.sh | 4 +++- tools/test/stress2/misc/nfs5.sh | 5 ++--- tools/test/stress2/misc/nfs6.sh | 7 +++---- tools/test/stress2/misc/nullfs10.sh | 5 ++--- tools/test/stress2/misc/nullfs11.sh | 5 ++--- tools/test/stress2/misc/nullfs12.sh | 5 ++--- tools/test/stress2/misc/nullfs13.sh | 5 ++--- tools/test/stress2/misc/nullfs14.sh | 5 ++--- tools/test/stress2/misc/nullfs15.sh | 5 ++--- tools/test/stress2/misc/nullfs18.sh | 5 ++--- tools/test/stress2/misc/nullfs19.sh | 5 ++--- tools/test/stress2/misc/nullfs20.sh | 5 ++--- tools/test/stress2/misc/nullfs21.sh | 5 ++--- tools/test/stress2/misc/nullfs22.sh | 5 ++--- tools/test/stress2/misc/nullfs25.sh | 5 ++--- tools/test/stress2/misc/nullfs27.sh | 5 ++--- tools/test/stress2/misc/nullfs7.sh | 5 ++--- tools/test/stress2/misc/nullfs9.sh | 5 ++--- tools/test/stress2/misc/overcommit.sh | 5 ++--- tools/test/stress2/misc/overcommit2.sh | 5 ++--- tools/test/stress2/misc/overlap.sh | 5 ++--- tools/test/stress2/misc/pageout.sh | 5 ++--- tools/test/stress2/misc/parallelmount.sh | 5 ++--- tools/test/stress2/misc/parallelmount2.sh | 9 ++++---- tools/test/stress2/misc/pcatch.sh | 5 ++--- tools/test/stress2/misc/pfl.sh | 10 ++++----- tools/test/stress2/misc/pfl2.sh | 10 ++++----- tools/test/stress2/misc/pfl4.sh | 7 +++---- tools/test/stress2/misc/pread.sh | 5 ++--- tools/test/stress2/misc/quota1.sh | 7 +++---- tools/test/stress2/misc/quota10.sh | 7 +++---- tools/test/stress2/misc/quota11.sh | 7 +++---- tools/test/stress2/misc/quota12.sh | 7 +++---- tools/test/stress2/misc/quota2.sh | 7 +++---- tools/test/stress2/misc/quota3.sh | 7 +++---- tools/test/stress2/misc/quota4.sh | 9 ++++---- tools/test/stress2/misc/quota6.sh | 7 +++---- tools/test/stress2/misc/quota7.sh | 5 ++--- tools/test/stress2/misc/quota8.sh | 7 +++---- tools/test/stress2/misc/quota9.sh | 5 ++--- tools/test/stress2/misc/readdir.sh | 10 ++++----- tools/test/stress2/misc/recursiveflushes.sh | 5 ++--- tools/test/stress2/misc/rename10.sh | 7 +++---- tools/test/stress2/misc/rename11.sh | 9 ++++---- tools/test/stress2/misc/rename12.sh | 7 +++---- tools/test/stress2/misc/rename13.sh | 5 ++--- tools/test/stress2/misc/rename5.sh | 9 ++++---- tools/test/stress2/misc/rename6.sh | 7 +++---- tools/test/stress2/misc/rename7.sh | 9 ++++---- tools/test/stress2/misc/rename8.sh | 9 ++++---- tools/test/stress2/misc/rename9.sh | 7 +++---- tools/test/stress2/misc/rot.sh | 5 ++--- tools/test/stress2/misc/routetbl.sh | 5 ++--- tools/test/stress2/misc/rw.sh | 5 ++--- tools/test/stress2/misc/sched.sh | 5 ++--- tools/test/stress2/misc/sendfile10.sh | 5 ++--- tools/test/stress2/misc/sendfile13.sh | 16 +++++++-------- tools/test/stress2/misc/sendfile14.sh | 14 ++++++------- tools/test/stress2/misc/sendfile15.sh | 5 ++--- tools/test/stress2/misc/sendfile16.sh | 5 ++--- tools/test/stress2/misc/sendfile17.sh | 5 ++--- tools/test/stress2/misc/sendfile21.sh | 1 - tools/test/stress2/misc/sendfile22.sh | 1 - tools/test/stress2/misc/sendfile23.sh | 1 - tools/test/stress2/misc/sendfile5.sh | 5 ++--- tools/test/stress2/misc/sendfile6.sh | 5 ++--- tools/test/stress2/misc/sendfile8.sh | 5 ++--- tools/test/stress2/misc/sendfile9.sh | 5 ++--- tools/test/stress2/misc/setuid.sh | 5 ++--- tools/test/stress2/misc/sigxcpu.sh | 5 ++--- tools/test/stress2/misc/snap10.sh | 5 ++--- tools/test/stress2/misc/snap11.sh | 7 +++---- tools/test/stress2/misc/snap12.sh | 7 +++---- tools/test/stress2/misc/snap8.sh | 11 +++++----- tools/test/stress2/misc/snap9.sh | 5 ++--- tools/test/stress2/misc/socketpair4.sh | 1 - tools/test/stress2/misc/sparse.sh | 5 ++--- tools/test/stress2/misc/spin.sh | 5 ++--- tools/test/stress2/misc/suj.sh | 7 +++---- tools/test/stress2/misc/suj11.sh | 11 +++++----- tools/test/stress2/misc/suj13.sh | 7 +++---- tools/test/stress2/misc/suj14.sh | 5 ++--- tools/test/stress2/misc/suj15.sh | 7 +++---- tools/test/stress2/misc/suj16.sh | 5 ++--- tools/test/stress2/misc/suj17.sh | 9 ++++---- tools/test/stress2/misc/suj18.sh | 5 ++--- tools/test/stress2/misc/suj19.sh | 5 ++--- tools/test/stress2/misc/suj2.sh | 5 ++--- tools/test/stress2/misc/suj20.sh | 5 ++--- tools/test/stress2/misc/suj21.sh | 5 ++--- tools/test/stress2/misc/suj22.sh | 13 ++++++------ tools/test/stress2/misc/suj23.sh | 5 ++--- tools/test/stress2/misc/suj24.sh | 5 ++--- tools/test/stress2/misc/suj25.sh | 5 ++--- tools/test/stress2/misc/suj26.sh | 5 ++--- tools/test/stress2/misc/suj27.sh | 5 ++--- tools/test/stress2/misc/suj28.sh | 5 ++--- tools/test/stress2/misc/suj29.sh | 15 +++++++------- tools/test/stress2/misc/suj30.sh | 5 ++--- tools/test/stress2/misc/suj31.sh | 11 +++++----- tools/test/stress2/misc/suj32.sh | 11 +++++----- tools/test/stress2/misc/suj33.sh | 9 ++++---- tools/test/stress2/misc/suj34.sh | 5 ++--- tools/test/stress2/misc/suj4.sh | 5 ++--- tools/test/stress2/misc/suj5.sh | 5 ++--- tools/test/stress2/misc/suj6.sh | 5 ++--- tools/test/stress2/misc/suj7.sh | 9 ++++---- tools/test/stress2/misc/suj8.sh | 11 +++++----- tools/test/stress2/misc/suj9.sh | 5 ++--- tools/test/stress2/misc/swap2.sh | 5 ++--- tools/test/stress2/misc/swapoff.sh | 5 ++--- tools/test/stress2/misc/swapoff2.sh | 5 ++--- tools/test/stress2/misc/symlink3.sh | 7 +++---- tools/test/stress2/misc/symlink4.sh | 5 ++--- tools/test/stress2/misc/syscall4.sh | 9 ++++---- tools/test/stress2/misc/trim.sh | 9 ++++---- tools/test/stress2/misc/trim2.sh | 9 ++++---- tools/test/stress2/misc/trim3.sh | 9 ++++---- tools/test/stress2/misc/trim4.sh | 9 ++++---- tools/test/stress2/misc/trim5.sh | 5 ++--- tools/test/stress2/misc/truncate3.sh | 7 +++---- tools/test/stress2/misc/truncate4.sh | 7 +++---- tools/test/stress2/misc/truncate5.sh | 9 ++++---- tools/test/stress2/misc/truncate7.sh | 9 ++++---- tools/test/stress2/misc/truncate8.sh | 8 ++++++-- tools/test/stress2/misc/truncate9.sh | 5 ++--- tools/test/stress2/misc/tvnlru.sh | 13 ++++++------ tools/test/stress2/misc/ufsbench.sh | 5 ++--- tools/test/stress2/misc/umount.sh | 7 +++---- tools/test/stress2/misc/umount2.sh | 5 ++--- tools/test/stress2/misc/umount3.sh | 7 +++---- tools/test/stress2/misc/umountf.sh | 7 +++---- tools/test/stress2/misc/umountf2.sh | 7 +++---- tools/test/stress2/misc/umountf3.sh | 5 ++--- tools/test/stress2/misc/umountf4.sh | 5 ++--- tools/test/stress2/misc/umountf5.sh | 7 +++---- tools/test/stress2/misc/umountf6.sh | 5 ++--- tools/test/stress2/misc/umountf7.sh | 5 ++--- tools/test/stress2/misc/union.sh | 22 +++++++++----------- tools/test/stress2/misc/unionfs3.sh | 5 ++--- tools/test/stress2/misc/vunref.sh | 7 +++---- tools/test/stress2/misc/vunref2.sh | 9 ++++---- 275 files changed, 799 insertions(+), 1018 deletions(-) diff --git a/tools/test/stress2/default.cfg b/tools/test/stress2/default.cfg index 43b89dc7e160..f7748b55fa04 100644 --- a/tools/test/stress2/default.cfg +++ b/tools/test/stress2/default.cfg @@ -58,7 +58,6 @@ export diskimage=${diskimage:-/tmp/diskimage} # Location of 1G disk image export mntpoint=${mntpoint:-/mnt} # Disk image mount point export testuser=${testuser:-TBD} # Name of non root test user export mdstart=${mdstart:-10} # Start of free md units -export part=${part:-a} # Partition to use on a md FS export newfs_flags=${newfs_flags:-"-U"} # Default file system flags export stress2origin=${stress2origin:-`pwd`} export stress2tools=`dirname $stress2origin`/tools diff --git a/tools/test/stress2/misc/advlock.sh b/tools/test/stress2/misc/advlock.sh index 16b67c3f3340..9e7144856310 100755 --- a/tools/test/stress2/misc/advlock.sh +++ b/tools/test/stress2/misc/advlock.sh @@ -60,9 +60,8 @@ rm -f advlock.c mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 512m -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint cp /usr/bin/true $mntpoint cd $mntpoint diff --git a/tools/test/stress2/misc/audit2.sh b/tools/test/stress2/misc/audit2.sh index 1435b13d9768..36a6339b8852 100755 --- a/tools/test/stress2/misc/audit2.sh +++ b/tools/test/stress2/misc/audit2.sh @@ -37,9 +37,8 @@ pgrep -q auditd && exit 0 || service auditd onestart mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export runRUNTIME=5m @@ -52,7 +51,7 @@ while mount | grep $mntpoint | grep -q /dev/md; do umount $mntpoint || sleep 1 [ $((n += 1)) -gt 300 ] && { echo FAIL; exit 1; } done -checkfs /dev/md${mdstart}$part; s=$? +checkfs /dev/md$mdstart; s=$? mdconfig -d -u $mdstart service auditd onestop diff --git a/tools/test/stress2/misc/backingstore.sh b/tools/test/stress2/misc/backingstore.sh index b16ff852acd9..5c8a1ac83577 100755 --- a/tools/test/stress2/misc/backingstore.sh +++ b/tools/test/stress2/misc/backingstore.sh @@ -37,45 +37,43 @@ export here=`pwd` m=$mdstart -mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m +mount | grep "$mntpoint" | grep -q md$m && umount $mntpoint$m mdconfig -l | grep -q md$m && mdconfig -d -u $m dd if=/dev/zero of=$D$m bs=100m count=1 status=none || exit 1 mdconfig -a -t vnode -f $D$m -u $m -bsdlabel -w md$m auto -newfs md${m}$part > /dev/null 2>&1 -[ -d ${mntpoint}$m ] || mkdir -p ${mntpoint}$m -mount $opt /dev/md${m}$part ${mntpoint}$m +newfs md${m} > /dev/null 2>&1 +[ -d $mntpoint$m ] || mkdir -p $mntpoint$m +mount $opt /dev/md$m $mntpoint$m n=$m m=$((m + 1)) -mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m +mount | grep "$mntpoint$m" | grep -q md$m && umount $mntpoint$m mdconfig -l | grep -q md$m && mdconfig -d -u $m -truncate -s 500M ${mntpoint}$n/diskimage -mdconfig -a -t vnode -f ${mntpoint}$n/diskimage -u $m +truncate -s 500M $mntpoint$n/diskimage +mdconfig -a -t vnode -f $mntpoint$n/diskimage -u $m -bsdlabel -w md$m auto -newfs md${m}$part > /dev/null 2>&1 -[ -d ${mntpoint}$m ] || mkdir -p ${mntpoint}$m -mount $opt /dev/md${m}$part ${mntpoint}$m +newfs md${m} > /dev/null 2>&1 +[ -d $mntpoint$m ] || mkdir -p $mntpoint$m +mount $opt /dev/md$m $mntpoint$m -export RUNDIR=${mntpoint}$m/stressX +export RUNDIR=$mntpoint$m/stressX ../testcases/rw/rw -t 5m -i 200 -h -n -while mount | grep -q ${mntpoint}$m; do +while mount | grep -q $mntpoint$m; do flag=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f" || echo "") - umount $flag ${mntpoint}$m > /dev/null 2>&1 + umount $flag $mntpoint$m > /dev/null 2>&1 done mdconfig -l | grep -q md$m && mdconfig -d -u $m m=$((m - 1)) -while mount | grep -q ${mntpoint}$m; do +while mount | grep -q $mntpoint$m; do umount $([ $((`date '+%s'` % 2)) -eq 0 ] && \ - echo "-f" || echo "") ${mntpoint}$m > /dev/null 2>&1 + echo "-f" || echo "") $mntpoint$m > /dev/null 2>&1 done mdconfig -l | grep -q md$m && mdconfig -d -u $m rm -f $D diff --git a/tools/test/stress2/misc/backingstore2.sh b/tools/test/stress2/misc/backingstore2.sh index 48dc6109f719..91b8cb7acb68 100755 --- a/tools/test/stress2/misc/backingstore2.sh +++ b/tools/test/stress2/misc/backingstore2.sh @@ -40,33 +40,31 @@ export here=`pwd` m1=$mdstart m2=$((m1 + 1)) -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint$m2" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint$m1" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 -[ -d ${mntpoint}$m1 ] || mkdir -p ${mntpoint}$m1 -[ -d ${mntpoint}$m2 ] || mkdir -p ${mntpoint}$m2 +[ -d $mntpoint$m1 ] || mkdir -p $mntpoint$m1 +[ -d $mntpoint$m2 ] || mkdir -p $mntpoint$m2 dd if=/dev/zero of=$D$m bs=100m count=1 status=none || exit 1 mdconfig -a -t vnode -f $D$m1 -u $m1 -bsdlabel -w md$m1 auto -newfs md${m1}$part > /dev/null 2>&1 -mount /dev/md${m1}$part ${mntpoint}$m1 +newfs md$m1 > /dev/null 2>&1 +mount /dev/md$m1 $mntpoint$m1 -truncate -s 500M ${mntpoint}$m1/diskimage -mdconfig -a -t vnode -f ${mntpoint}$m1/diskimage -u $m2 +truncate -s 500M $mntpoint$m1/diskimage +mdconfig -a -t vnode -f $mntpoint$m1/diskimage -u $m2 -bsdlabel -w md$m2 auto -newfs md${m2}$part > /dev/null 2>&1 -mount /dev/md${m2}$part ${mntpoint}$m2 +newfs md$m2 > /dev/null 2>&1 +mount /dev/md$m2 $mntpoint$m2 # Reversed umount sequence: -umount -f /dev/md${m1}$part -umount -f /dev/md${m2}$part +umount -f /dev/md$m1 +umount -f /dev/md$m2 -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 diff --git a/tools/test/stress2/misc/backingstore3.sh b/tools/test/stress2/misc/backingstore3.sh index 2610983da92e..1cea69c46477 100755 --- a/tools/test/stress2/misc/backingstore3.sh +++ b/tools/test/stress2/misc/backingstore3.sh @@ -39,35 +39,33 @@ export here=`pwd` m1=$mdstart m2=$((m1 + 1)) -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 -[ -d ${mntpoint}$m1 ] || mkdir -p ${mntpoint}$m1 -[ -d ${mntpoint}$m2 ] || mkdir -p ${mntpoint}$m2 +[ -d $mntpoint$m1 ] || mkdir -p $mntpoint$m1 +[ -d $mntpoint$m2 ] || mkdir -p $mntpoint$m2 dd if=/dev=zero of=$D$m bs=25m count=1 status=none || exit 1 mdconfig -a -t vnode -f $D$m1 -u $m1 -bsdlabel -w md$m1 auto -newfs md${m1}$part > /dev/null 2>&1 -mount /dev/md${m1}$part ${mntpoint}$m1 +newfs md$m1 > /dev/null 2>&1 +mount /dev/md$m1 $mntpoint$m1 -truncate -s 500M ${mntpoint}$m1/diskimage -mdconfig -a -t vnode -f ${mntpoint}$m1/diskimage -u $m2 +truncate -s 500M $mntpoint$m1/diskimage +mdconfig -a -t vnode -f $mntpoint$m1/diskimage -u $m2 -bsdlabel -w md$m2 auto -newfs md${m2}$part > /dev/null 2>&1 -mount /dev/md${m2}$part ${mntpoint}$m2 +newfs md$m2 > /dev/null 2>&1 +mount /dev/md$m2 $mntpoint$m2 -dd if=/dev/zero of=${mntpoint}$m2/file bs=1m > /dev/null 2>&1 +dd if=/dev/zero of=$mntpoint$m2/file bs=1m > /dev/null 2>&1 # Reversed umount sequence: -umount -f /dev/md${m1}$part -umount -f /dev/md${m2}$part +umount -f /dev/md$m1 +umount -f /dev/md$m2 -mount | grep "$mntpoint" | grep -q md$m2 && umount ${mntpoint}$m2 +mount | grep "$mntpoint" | grep -q md$m2 && umount $mntpoint$m2 mdconfig -l | grep -q md$m2 && mdconfig -d -u $m2 -mount | grep "$mntpoint" | grep -q md$m1 && umount ${mntpoint}$m1 +mount | grep "$mntpoint" | grep -q md$m1 && umount $mntpoint$m1 mdconfig -l | grep -q md$m1 && mdconfig -d -u $m1 diff --git a/tools/test/stress2/misc/badcode.sh b/tools/test/stress2/misc/badcode.sh index c869c3a8c13e..caa9b1b6d461 100755 --- a/tools/test/stress2/misc/badcode.sh +++ b/tools/test/stress2/misc/badcode.sh @@ -40,9 +40,8 @@ kldstat -v | grep -q pty || kldload pty # ignore any load failure mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint export LOAD=80 @@ -61,5 +60,5 @@ su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' while mount | grep "on $mntpoint " | grep -q /dev/md; do umount $mntpoint || sleep 1 done -checkfs /dev/md${mdstart}$part +checkfs /dev/md$mdstart mdconfig -d -u $mdstart diff --git a/tools/test/stress2/misc/bench.sh b/tools/test/stress2/misc/bench.sh index 965c9a3d9b99..33b6eb653879 100755 --- a/tools/test/stress2/misc/bench.sh +++ b/tools/test/stress2/misc/bench.sh @@ -43,16 +43,15 @@ cd $odir mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto log=/tmp/stress2.d/bench.sh.log [ -f $log ] && old=`tail -1 $log | awk '{print $2}'` tmp=/tmp/bench.sh.tmp s=0 for j in `jot 5`; do - newfs -n -b 4096 -f 512 -i 1024 md${mdstart}$part > \ + newfs -n -b 4096 -f 512 -i 1024 md$mdstart > \ /dev/null - mount -o async /dev/md${mdstart}$part $mntpoint + mount -o async /dev/md$mdstart $mntpoint /usr/bin/time sh -c "(cd $mntpoint; /tmp/bench)" 2>&1 | \ awk '{print $1}' [ $? -ne 0 ] && s=1 diff --git a/tools/test/stress2/misc/beneath2.sh b/tools/test/stress2/misc/beneath2.sh index a89cd8deb1e1..ad1f5c538258 100755 --- a/tools/test/stress2/misc/beneath2.sh +++ b/tools/test/stress2/misc/beneath2.sh @@ -50,9 +50,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/beneath3.sh b/tools/test/stress2/misc/beneath3.sh index 46f370899ee8..9e7493a2322c 100755 --- a/tools/test/stress2/misc/beneath3.sh +++ b/tools/test/stress2/misc/beneath3.sh @@ -48,9 +48,8 @@ set -e mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint set +e cd $mntpoint diff --git a/tools/test/stress2/misc/bio.sh b/tools/test/stress2/misc/bio.sh index d344fdb281c3..69bdc773b3ce 100755 --- a/tools/test/stress2/misc/bio.sh +++ b/tools/test/stress2/misc/bio.sh @@ -50,9 +50,8 @@ cd $odir mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint (cd $mntpoint; /tmp/bio) & pid1=$! diff --git a/tools/test/stress2/misc/buildworld.sh b/tools/test/stress2/misc/buildworld.sh index ef4927d8dd1b..595b387c90ae 100755 --- a/tools/test/stress2/misc/buildworld.sh +++ b/tools/test/stress2/misc/buildworld.sh @@ -45,9 +45,8 @@ mount | grep -q "on $mntpoint " && umount $mntpoint dd if=/dev/zero of=$diskimage bs=1m count=3k status=none trap "rm -f $diskimage" EXIT INT mdconfig -a -t vnode -f $diskimage -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint cd /usr/src export MAKEOBJDIRPREFIX=$mntpoint/obj diff --git a/tools/test/stress2/misc/buildworld3.sh b/tools/test/stress2/misc/buildworld3.sh index 518c16151bcd..a5dc642ce876 100755 --- a/tools/test/stress2/misc/buildworld3.sh +++ b/tools/test/stress2/misc/buildworld3.sh @@ -41,12 +41,11 @@ [ -d /usr/src/sys ] || exit 0 mount | grep -q "on $mntpoint " && umount $mntpoint mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null export PATH_FSTAB=/tmp/fstab trap "rm -f $PATH_FSTAB" EXIT INT -echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB +echo "/dev/md$mdstart $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB mount $mntpoint set `df -ik $mntpoint | tail -1 | awk '{print $4,$7}'` export QK=$(($1 / 2)) diff --git a/tools/test/stress2/misc/buildworld4.sh b/tools/test/stress2/misc/buildworld4.sh index fae22b9a17b9..98d4904ec4bd 100755 --- a/tools/test/stress2/misc/buildworld4.sh +++ b/tools/test/stress2/misc/buildworld4.sh @@ -38,10 +38,9 @@ rm -f $diskimage mount | grep -q "on $mntpoint " && umount $mntpoint mdconfig -a -t swap -s 5g -u $mdstart -bsdlabel -w md$mdstart auto [ "$newfs_flags" = "-U" ] && newfs_flags="-j" -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mount | grep $mntpoint cd /usr/src diff --git a/tools/test/stress2/misc/burnin.sh b/tools/test/stress2/misc/burnin.sh index 0b6c206cd69b..352cc55426e3 100755 --- a/tools/test/stress2/misc/burnin.sh +++ b/tools/test/stress2/misc/burnin.sh @@ -45,9 +45,8 @@ cd $odir mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs -n md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs -n md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint d=`date '+%Y%m%dT%H%M%S'` log=/tmp/burnin.$d.log mode=`pgrep -q cron && echo "Multi-user" || echo "Single-user"` diff --git a/tools/test/stress2/misc/cmp.sh b/tools/test/stress2/misc/cmp.sh index bd492c8493ca..91adf5ea5ab0 100755 --- a/tools/test/stress2/misc/cmp.sh +++ b/tools/test/stress2/misc/cmp.sh @@ -45,10 +45,9 @@ mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto # Don't use SU due to bogus "out of inodes" messages. -newfs md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint daemon sh -c "(cd $here/../testcases/swap; ./swap -t 5m -i 20 -h -l 100)" \ @@ -58,7 +57,7 @@ su $testuser -c "/tmp/cmp $mntpoint" & while kill -0 $! 2>/dev/null; do umount -f $mntpoint && - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint sleep .1 done diff --git a/tools/test/stress2/misc/core2.sh b/tools/test/stress2/misc/core2.sh index 4f0e0472af95..2e8396858982 100755 --- a/tools/test/stress2/misc/core2.sh +++ b/tools/test/stress2/misc/core2.sh @@ -42,9 +42,8 @@ cd $RUNDIR mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint [ -c /dev/mn$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint touch /tmp/continue for i in `jot 64`; do diff --git a/tools/test/stress2/misc/core3.sh b/tools/test/stress2/misc/core3.sh index 68d55468c087..5d0d0c258651 100755 --- a/tools/test/stress2/misc/core3.sh +++ b/tools/test/stress2/misc/core3.sh @@ -49,9 +49,8 @@ cd $odir mount | grep -q "on $mntpoint " && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t swap -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint mkdir $mntpoint/d chmod 777 $mntpoint/d @@ -65,7 +64,7 @@ while pgrep -q core3; do done > /dev/null 2>&1 & while pgrep -q core3; do [ -d $mntpoint/d ] || - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint done > /dev/null 2>&1 wait $pid status=$? diff --git a/tools/test/stress2/misc/core4.sh b/tools/test/stress2/misc/core4.sh index e77b5176c261..0f0096e7052b 100755 --- a/tools/test/stress2/misc/core4.sh +++ b/tools/test/stress2/misc/core4.sh @@ -45,11 +45,10 @@ mount | grep -q "$mntpoint" && umount $mntpoint mdconfig -l | grep -q $mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null +newfs $newfs_flags md$mdstart > /dev/null for i in `jot 20`; do - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md$mdstart $mntpoint chmod 777 $mntpoint su $testuser -c "(cd $mntpoint; /tmp/core4)" & su $testuser -c "(cd $mntpoint; /tmp/core4)" & diff --git a/tools/test/stress2/misc/core5.sh b/tools/test/stress2/misc/core5.sh index 6dc6ba96b742..856b01608f2e 100755 --- a/tools/test/stress2/misc/core5.sh +++ b/tools/test/stress2/misc/core5.sh @@ -91,10 +91,9 @@ mount | grep -q "on $mntpoint " && umount $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart mdconfig -a -t malloc -s 1g -u $mdstart -bsdlabel -w md$mdstart auto -newfs -b 4096 -f 512 -i 2048 md${mdstart}$part > /dev/null -mount -o async /dev/md${mdstart}$part $mntpoint || exit 1 +newfs -b 4096 -f 512 -i 2048 md$mdstart > /dev/null +mount -o async /dev/md$mdstart $mntpoint || exit 1 cp /tmp/core5 $mntpoint mkdir $mntpoint/dir diff --git a/tools/test/stress2/misc/crossmp.sh b/tools/test/stress2/misc/crossmp.sh index 7d1ccbe3a469..0bd07cea2aaf 100755 --- a/tools/test/stress2/misc/crossmp.sh +++ b/tools/test/stress2/misc/crossmp.sh @@ -48,8 +48,7 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D$m bs=1m count=1 status=none mdconfig -a -t vnode -f $D$m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -77,7 +76,7 @@ else # The test: Parallel mount and unmounts for i in `jot 1024`; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m while mount | grep -q "on ${mntpoint}$m "; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") diff --git a/tools/test/stress2/misc/crossmp10.sh b/tools/test/stress2/misc/crossmp10.sh index 30e64a064dac..7833aec176cb 100755 --- a/tools/test/stress2/misc/crossmp10.sh +++ b/tools/test/stress2/misc/crossmp10.sh @@ -48,8 +48,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - mke2fs -m 0 /dev/md${m}$part > /dev/null 2>&1 + mke2fs -m 0 /dev/md${m} > /dev/null 2>&1 done # start the parallel tests @@ -83,7 +82,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ]; do m=$1 - mount -t ext2fs /dev/md${m}$part ${mntpoint}$m && + mount -t ext2fs /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp11.sh b/tools/test/stress2/misc/crossmp11.sh index 8bc008f6f504..8332b1592675 100755 --- a/tools/test/stress2/misc/crossmp11.sh +++ b/tools/test/stress2/misc/crossmp11.sh @@ -64,8 +64,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -97,7 +96,7 @@ else export runRUNTIME=20s # The test: Parallel mount and unmounts for i in `jot 3`; do - mount /dev/md${m}$part ${mntpoint}$m && + mount /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp3.sh b/tools/test/stress2/misc/crossmp3.sh index 30c9f86840f1..0f7c01af5569 100755 --- a/tools/test/stress2/misc/crossmp3.sh +++ b/tools/test/stress2/misc/crossmp3.sh @@ -57,8 +57,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -89,7 +88,7 @@ else # The test: Parallel mount and unmounts for i in `jot 3`; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m && + mount /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp4.sh b/tools/test/stress2/misc/crossmp4.sh index 7f24097475f3..e22f969b72bb 100755 --- a/tools/test/stress2/misc/crossmp4.sh +++ b/tools/test/stress2/misc/crossmp4.sh @@ -52,9 +52,8 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s ${size}m -u $mdstart - bsdlabel -w md$mdstart auto - newfs $newfs_flags md${mdstart}$part > /dev/null 2>&1 - mount /dev/md${mdstart}$part $mntpoint + newfs $newfs_flags md$mdstart > /dev/null 2>&1 + mount /dev/md$mdstart $mntpoint # start the parallel tests for i in `jot $mounts`; do diff --git a/tools/test/stress2/misc/crossmp5.sh b/tools/test/stress2/misc/crossmp5.sh index 9a636c9aae45..b5a8304f2dcb 100755 --- a/tools/test/stress2/misc/crossmp5.sh +++ b/tools/test/stress2/misc/crossmp5.sh @@ -48,8 +48,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -77,7 +76,7 @@ else # The test: Parallel mount and unmount m=$1 for i in `jot 200`; do - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m chmod 777 ${mntpoint}$m l=`jot -r 1 65535` dd if=/dev/zero of=$mntpoint/$i bs=$l count=100 \ diff --git a/tools/test/stress2/misc/crossmp8.sh b/tools/test/stress2/misc/crossmp8.sh index f8d06d6a4a30..e877dfaf6d1c 100755 --- a/tools/test/stress2/misc/crossmp8.sh +++ b/tools/test/stress2/misc/crossmp8.sh @@ -61,8 +61,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s ${size}m -u $m - bsdlabel -w md$m auto - newfs md${m}$part > /dev/null 2>&1 + newfs md${m} > /dev/null 2>&1 done # start the parallel tests @@ -100,7 +99,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ]; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m && + mount /dev/md${m} ${mntpoint}$m && chmod 777 ${mntpoint}$m export RUNDIR=${mntpoint}$m/stressX export CTRLDIR=${mntpoint}$m/stressX.control diff --git a/tools/test/stress2/misc/crossmp9.sh b/tools/test/stress2/misc/crossmp9.sh index e55f16b5ede4..b049f65aded9 100755 --- a/tools/test/stress2/misc/crossmp9.sh +++ b/tools/test/stress2/misc/crossmp9.sh @@ -47,8 +47,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md$m && mdconfig -d -u $m mdconfig -a -t swap -s 512m -u $m - bsdlabel -w md$m auto - newfs $newfs_flags md${m}$part > /dev/null 2>&1 + newfs $newfs_flags md${m} > /dev/null 2>&1 done # start the parallel tests @@ -78,7 +77,7 @@ else start=`date '+%s'` while [ $((`date '+%s'` - start)) -lt 300 ] ; do m=$1 - mount /dev/md${m}$part ${mntpoint}$m + mount /dev/md${m} ${mntpoint}$m while mount | grep -qw ${mntpoint}$m; do opt=$([ $((`date '+%s'` % 2)) -eq 0 ] && echo "-f") diff --git a/tools/test/stress2/misc/dangling.sh b/tools/test/stress2/misc/dangling.sh index 5f3db6db00ec..cd807a382375 100755 --- a/tools/test/stress2/misc/dangling.sh +++ b/tools/test/stress2/misc/dangling.sh @@ -42,9 +42,8 @@ mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 4g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mntpoint || exit 1 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint || exit 1 chmod 777 $mntpoint export runRUNTIME=4m diff --git a/tools/test/stress2/misc/datamove5.sh b/tools/test/stress2/misc/datamove5.sh index 5f4a868f03b1..49e97570100d 100755 --- a/tools/test/stress2/misc/datamove5.sh +++ b/tools/test/stress2/misc/datamove5.sh @@ -47,9 +47,8 @@ mount | grep -wq $mp2 && umount $mp2 mount | grep -wq $mp1 && umount $mp1 mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 2g -u $mdstart || exit 1 -bsdlabel -w md$mdstart auto -newfs $newfs_flags md${mdstart}$part > /dev/null -mount /dev/md${mdstart}$part $mp1 +newfs $newfs_flags md$mdstart > /dev/null +mount /dev/md$mdstart $mp1 *** 5235 LINES SKIPPED ***