From owner-svn-src-user@freebsd.org Tue May 2 10:13:52 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58FFFD576B9 for ; Tue, 2 May 2017 10:13:52 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 347A9B9A; Tue, 2 May 2017 10:13:52 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v42ADpoH095225; Tue, 2 May 2017 10:13:51 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42ADpW4095222; Tue, 2 May 2017 10:13:51 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201705021013.v42ADpW4095222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 2 May 2017 10:13:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r317677 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2017 10:13:52 -0000 Author: pho Date: Tue May 2 10:13:50 2017 New Revision: 317677 URL: https://svnweb.freebsd.org/changeset/base/317677 Log: Add a new isofs test. If mkisofs is not installed, just ignore the test. Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/isofs3.sh (contents, props changed) Modified: user/pho/stress2/misc/isofs.sh user/pho/stress2/misc/isofs2.sh Modified: user/pho/stress2/misc/isofs.sh ============================================================================== --- user/pho/stress2/misc/isofs.sh Tue May 2 10:06:46 2017 (r317676) +++ user/pho/stress2/misc/isofs.sh Tue May 2 10:13:50 2017 (r317677) @@ -30,7 +30,7 @@ [ `id -u ` -ne 0 ] && echo "Must not be root!" && exit 1 -[ -z "`type mkisofs 2>/dev/null`" ] && echo "mkisofs not found" && exit 1 +[ -z "`type mkisofs 2>/dev/null`" ] && echo "mkisofs not found" && exit 0 . ../default.cfg Modified: user/pho/stress2/misc/isofs2.sh ============================================================================== --- user/pho/stress2/misc/isofs2.sh Tue May 2 10:06:46 2017 (r317676) +++ user/pho/stress2/misc/isofs2.sh Tue May 2 10:13:50 2017 (r317677) @@ -35,7 +35,7 @@ [ `id -u ` -ne 0 ] && echo "Must not be root!" && exit 1 -[ -z "`type mkisofs 2>/dev/null`" ] && echo "mkisofs not found" && exit 1 +[ -z "`type mkisofs 2>/dev/null`" ] && echo "mkisofs not found" && exit 0 . ../default.cfg Added: user/pho/stress2/misc/isofs3.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/isofs3.sh Tue May 2 10:13:50 2017 (r317677) @@ -0,0 +1,68 @@ +#!/bin/sh + +# +# Copyright (c) 2016 Dell EMC +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Simple isofs / union test scenario + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +[ -z "`which mkisofs`" ] && echo "mkisofs not found" && exit 0 + +. ../default.cfg + +D=`dirname $diskimage`/dir +I=`dirname $diskimage`/dir.iso + +rm -rf $D $I +mkdir -p $D +cp -r ../../stress2 $D 2>/dev/null + +mkisofs -o $I -r $D > /dev/null 2>&1 + +mount | grep -q /dev/md${mdstart}$part && umount -f /dev/md${mdstart}$part +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart +mdconfig -a -t vnode -f $I -u $mdstart || exit 1 +mount -t cd9660 /dev/md$mdstart $mntpoint || exit 1 + +m2=$((mdstart + 1)) +mdconfig -s 1g -u $m2 +bsdlabel -w md$m2 auto +newfs $newfs_flags md${m2}$part > /dev/null + +mount -o union /dev/md${m2}$part $mntpoint || exit 1 + +export RUNDIR=$mntpoint/stressX +export runRUNTIME=5m +(cd $mntpoint/stress2; ./run.sh marcus.cfg) > /dev/null + +umount /mnt +mdconfig -d -u $m2 +umount /mnt +mdconfig -d -u $mdstart +rm -rf $D $I +exit 0