From owner-svn-src-user@freebsd.org Mon Nov 23 11:01:12 2015 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 36C8EA30F57 for ; Mon, 23 Nov 2015 11:01:12 +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 EACFF1E89; Mon, 23 Nov 2015 11:01:11 +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 tANB1BoL031947; Mon, 23 Nov 2015 11:01:11 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANB1AbF031945; Mon, 23 Nov 2015 11:01:10 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201511231101.tANB1AbF031945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 23 Nov 2015 11:01:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291192 - 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.20 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: Mon, 23 Nov 2015 11:01:12 -0000 Author: pho Date: Mon Nov 23 11:01:10 2015 New Revision: 291192 URL: https://svnweb.freebsd.org/changeset/base/291192 Log: Added two new test scenarios. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/gnop.sh (contents, props changed) user/pho/stress2/misc/maxvnodes.sh (contents, props changed) Added: user/pho/stress2/misc/gnop.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/gnop.sh Mon Nov 23 11:01:10 2015 (r291192) @@ -0,0 +1,69 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# 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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Test with different sector size using gnop(8). +# Out of VM seen: +# https://people.freebsd.org/~pho/stress/log/gnop.txt + +test() { + . ../default.cfg + + 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 + gnop create -S $1 /dev/md$mdstart + newfs $newfs_flags /dev/md${mdstart}.nop > /dev/null + mount /dev/md${mdstart}.nop $mntpoint + chmod 777 $mntpoint + + export runRUNTIME=4m + export RUNDIR=$mntpoint/stressX + + su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 + + while mount | grep $mntpoint | grep -q /dev/md; do + umount $mntpoint || sleep 1 + done + checkfs /dev/md${mdstart}.nop + gnop destroy /dev/md${mdstart}.nop + mdconfig -d -u $mdstart +} + +gnop load +gnop status || exit + +for i in 1k 2k 4k 8k; do + test $i +done + +gnop unload Added: user/pho/stress2/misc/maxvnodes.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/maxvnodes.sh Mon Nov 23 11:01:10 2015 (r291192) @@ -0,0 +1,66 @@ +#!/bin/sh + +# +# Copyright (c) 2015 EMC Corp. +# 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$ +# + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +# Test dynamic kern.maxvnodes implementation. + +. ../default.cfg + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mount -o size=2g -t tmpfs tmpfs $mntpoint || exit 1 +chmod 777 $mntpoint + +oldmx=`sysctl -n kern.maxvnodes` +trap "sysctl kern.maxvnodes=$oldmx > /dev/null" EXIT SIGINT + +export runRUNTIME=10m +export RUNDIR=$mntpoint/stressX +export TESTPROGS=" +testcases/creat/creat +testcases/mkdir/mkdir +testcases/swap/swap +" +export creatINCARNATIONS=50 +export creatLOAD=100 + +su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > /dev/null 2>&1 & + +min=1000 +max=$((oldmx * 4)) +while kill -0 $! 2>/dev/null; do + sysctl kern.maxvnodes=`jot -r 1 $min $max` > /dev/null + sleep `jot -r 1 1 3` +done +wait + +while mount | grep $mntpoint | grep -q tmpfs; do + umount $mntpoint || sleep 1 +done From owner-svn-src-user@freebsd.org Mon Nov 23 15:04:25 2015 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 63A36A3381A for ; Mon, 23 Nov 2015 15:04:25 +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 17D4F106E; Mon, 23 Nov 2015 15:04:25 +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 tANF4OhZ003691; Mon, 23 Nov 2015 15:04:24 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANF4Owq003690; Mon, 23 Nov 2015 15:04:24 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201511231504.tANF4Owq003690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 23 Nov 2015 15:04:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291208 - 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.20 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: Mon, 23 Nov 2015 15:04:25 -0000 Author: pho Date: Mon Nov 23 15:04:24 2015 New Revision: 291208 URL: https://svnweb.freebsd.org/changeset/base/291208 Log: Capped runtime, added findings and cleaned up the shell script a bit. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/suj23.sh Modified: user/pho/stress2/misc/suj23.sh ============================================================================== --- user/pho/stress2/misc/suj23.sh Mon Nov 23 14:06:21 2015 (r291207) +++ user/pho/stress2/misc/suj23.sh Mon Nov 23 15:04:24 2015 (r291208) @@ -31,6 +31,12 @@ # Scenario from kern/159971 # bstg0003.c by Kirk Russell +# panic: ino 0xc84c9b00(0x3C8209) 65554, 32780 != 65570 +# https://people.freebsd.org/~pho/stress/log/suj23.txt + +# panic: first_unlinked_inodedep: prev != next. inodedep = 0xcadf9e00 +# https://people.freebsd.org/~pho/stress/log/jeff091.txt + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg @@ -41,21 +47,21 @@ sed '1,/^EOF/d' < $here/$0 > suj23.c mycc -o suj23 -Wall -Wextra -O2 suj23.c rm -f suj23.c -mount | grep "${mntpoint}" | grep -q md${mdstart} && umount ${mntpoint} -mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart} +mount | grep "on $mntpoint " | grep -q md$mdstart && umount $mntpoint +[ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart -mdconfig -a -t swap -s 1g -u ${mdstart} -bsdlabel -w md${mdstart} auto -newfs -j md${mdstart}${part} > /dev/null +mdconfig -a -t swap -s 1g -u $mdstart +bsdlabel -w md$mdstart auto +newfs -j md${mdstart}$part > /dev/null mount /dev/md${mdstart}$part $mntpoint chmod 777 $mntpoint su $testuser -c '/tmp/suj23' -while mount | grep -q ${mntpoint}; do - umount ${mntpoint} || sleep 1 +while mount | grep -q "on $mntpoint "; do + umount $mntpoint || sleep 1 done -mdconfig -d -u ${mdstart} +mdconfig -d -u $mdstart rm -f /tmp/suj23 exit 0 EOF @@ -81,10 +87,13 @@ EOF #include #include #include +#include #include #include #include +#define RUNTIME 600 + static char *bstg_pathstore[] = { "/mnt/111/z", "/mnt/111/aaaa", @@ -382,6 +391,7 @@ dosync() int main() { + time_t start; unsigned x; int i, status; void (*funcs[]) () = { @@ -413,10 +423,13 @@ main() /* give child a new seed for the pathname selection */ srand(x); + start = time(NULL); for (i = 0; i < 1000; i++) { /* each child will start looping at different * function */ (*funcs[x++ % 16]) (); + if (time(NULL) - start > RUNTIME) + break; } /* we never expect this code to run */ _exit(1); From owner-svn-src-user@freebsd.org Tue Nov 24 05:12:45 2015 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 CCD89A29AAF for ; Tue, 24 Nov 2015 05:12:45 +0000 (UTC) (envelope-from ngie@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 6C550110A; Tue, 24 Nov 2015 05:12:45 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO5CisY062536; Tue, 24 Nov 2015 05:12:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO5CfQr062505; Tue, 24 Nov 2015 05:12:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511240512.tAO5CfQr062505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 05:12:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291236 - in user/ngie/more-tests2: . bin/rmail cddl/contrib/opensolaris/cmd/zfs contrib/sendmail/include/sm contrib/xz contrib/xz/src/common contrib/xz/src/liblzma/api contrib/xz/src/l... 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.20 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, 24 Nov 2015 05:12:45 -0000 Author: ngie Date: Tue Nov 24 05:12:40 2015 New Revision: 291236 URL: https://svnweb.freebsd.org/changeset/base/291236 Log: MFhead @ r291235 Added: user/ngie/more-tests2/share/man/man4/mlx5en.4 - copied unchanged from r291235, head/share/man/man4/mlx5en.4 user/ngie/more-tests2/sys/dev/ath/if_ath_descdma.c - copied unchanged from r291235, head/sys/dev/ath/if_ath_descdma.c user/ngie/more-tests2/sys/dev/ath/if_ath_descdma.h - copied unchanged from r291235, head/sys/dev/ath/if_ath_descdma.h user/ngie/more-tests2/sys/dev/ath/if_ath_ioctl.c - copied unchanged from r291235, head/sys/dev/ath/if_ath_ioctl.c user/ngie/more-tests2/sys/dev/ath/if_ath_ioctl.h - copied unchanged from r291235, head/sys/dev/ath/if_ath_ioctl.h - copied from r291235, head/usr.bin/colldef/ - copied from r291235, head/usr.bin/mklocale/ user/ngie/more-tests2/usr.sbin/bsdconfig/includes/includes.sh - copied unchanged from r291235, head/usr.sbin/bsdconfig/includes/includes.sh Directory Properties: user/ngie/more-tests2/usr.bin/colldef/ (props changed) user/ngie/more-tests2/usr.bin/mklocale/ (props changed) Deleted: user/ngie/more-tests2/sys/boot/i386/boot0/boot0ext.S user/ngie/more-tests2/sys/boot/i386/boot0ext/ user/ngie/more-tests2/sys/modules/ispfw/isp_1040_it/ user/ngie/more-tests2/sys/modules/ispfw/isp_1080_it/ user/ngie/more-tests2/sys/modules/ispfw/isp_12160_it/ user/ngie/more-tests2/tools/build/options/WITH_OPENSSH_NONE_CIPHER user/ngie/more-tests2/usr.sbin/bsdconfig/includes/includes Modified: user/ngie/more-tests2/ObsoleteFiles.inc user/ngie/more-tests2/bin/rmail/Makefile.depend user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h user/ngie/more-tests2/contrib/xz/ChangeLog user/ngie/more-tests2/contrib/xz/THANKS user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c user/ngie/more-tests2/contrib/xz/src/xz/args.h user/ngie/more-tests2/contrib/xz/src/xz/file_io.c user/ngie/more-tests2/contrib/xz/src/xz/main.c user/ngie/more-tests2/contrib/xz/src/xz/message.c user/ngie/more-tests2/contrib/xz/src/xz/options.c user/ngie/more-tests2/contrib/xz/src/xz/xz.1 user/ngie/more-tests2/crypto/openssh/README.hpn user/ngie/more-tests2/crypto/openssh/cipher.c user/ngie/more-tests2/crypto/openssh/kex.c user/ngie/more-tests2/crypto/openssh/kex.h user/ngie/more-tests2/crypto/openssh/myproposal.h user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h user/ngie/more-tests2/crypto/openssh/packet.c user/ngie/more-tests2/crypto/openssh/packet.h user/ngie/more-tests2/crypto/openssh/pathnames.h user/ngie/more-tests2/crypto/openssh/readconf.c user/ngie/more-tests2/crypto/openssh/readconf.h user/ngie/more-tests2/crypto/openssh/servconf.c user/ngie/more-tests2/crypto/openssh/servconf.h user/ngie/more-tests2/crypto/openssh/ssh.c user/ngie/more-tests2/crypto/openssh/sshconnect2.c user/ngie/more-tests2/crypto/openssh/sshd.c user/ngie/more-tests2/gnu/usr.bin/binutils/ld/Makefile user/ngie/more-tests2/lib/libc/gen/popen.c user/ngie/more-tests2/lib/libc/stdio/fopen.3 user/ngie/more-tests2/lib/libc/tests/net/Makefile user/ngie/more-tests2/lib/libc/yp/yplib.c user/ngie/more-tests2/lib/liblzma/config.h user/ngie/more-tests2/lib/libmilter/Makefile.depend user/ngie/more-tests2/lib/libsm/Makefile.depend user/ngie/more-tests2/lib/libsmdb/Makefile.depend user/ngie/more-tests2/lib/libsmutil/Makefile.depend user/ngie/more-tests2/libexec/mail.local/Makefile.depend user/ngie/more-tests2/libexec/smrsh/Makefile.depend user/ngie/more-tests2/sbin/dumpon/dumpon.c user/ngie/more-tests2/sbin/newfs_msdos/mkfs_msdos.c user/ngie/more-tests2/sbin/newfs_msdos/mkfs_msdos.h user/ngie/more-tests2/sbin/newfs_msdos/newfs_msdos.c user/ngie/more-tests2/secure/lib/libssh/Makefile user/ngie/more-tests2/secure/usr.bin/ssh/Makefile user/ngie/more-tests2/secure/usr.sbin/sshd/Makefile user/ngie/more-tests2/share/examples/ses/srcs/getencstat.c user/ngie/more-tests2/share/man/man4/Makefile user/ngie/more-tests2/share/man/man4/isp.4 user/ngie/more-tests2/share/man/man4/witness.4 user/ngie/more-tests2/share/man/man7/release.7 user/ngie/more-tests2/share/man/man9/malloc.9 user/ngie/more-tests2/share/man/man9/printf.9 user/ngie/more-tests2/share/man/man9/style.9 user/ngie/more-tests2/share/misc/committers-src.dot user/ngie/more-tests2/share/mk/bsd.cpu.mk user/ngie/more-tests2/share/mk/bsd.crunchgen.mk user/ngie/more-tests2/share/mk/bsd.lib.mk user/ngie/more-tests2/share/mk/bsd.sys.mk user/ngie/more-tests2/share/mk/local.meta.sys.mk user/ngie/more-tests2/share/mk/src.opts.mk user/ngie/more-tests2/sys/amd64/amd64/elf_machdep.c user/ngie/more-tests2/sys/amd64/linux/linux_dummy.c user/ngie/more-tests2/sys/arm/allwinner/a20/std.a20 user/ngie/more-tests2/sys/arm/allwinner/files.allwinner user/ngie/more-tests2/sys/arm/allwinner/std.a10 user/ngie/more-tests2/sys/arm/altera/socfpga/files.socfpga user/ngie/more-tests2/sys/arm/altera/socfpga/std.socfpga user/ngie/more-tests2/sys/arm/amlogic/aml8726/files.aml8726 user/ngie/more-tests2/sys/arm/annapurna/alpine/files.alpine user/ngie/more-tests2/sys/arm/annapurna/alpine/std.alpine user/ngie/more-tests2/sys/arm/arm/bus_space_base.c user/ngie/more-tests2/sys/arm/arm/exception.S user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c user/ngie/more-tests2/sys/arm/arm/pmu.c user/ngie/more-tests2/sys/arm/arm/trap-v6.c user/ngie/more-tests2/sys/arm/at91/files.at91 user/ngie/more-tests2/sys/arm/broadcom/bcm2835/files.bcm2836 user/ngie/more-tests2/sys/arm/broadcom/bcm2835/files.bcm283x user/ngie/more-tests2/sys/arm/broadcom/bcm2835/std.rpi user/ngie/more-tests2/sys/arm/cavium/cns11xx/files.econa user/ngie/more-tests2/sys/arm/conf/AML8726 user/ngie/more-tests2/sys/arm/conf/EXYNOS5.common user/ngie/more-tests2/sys/arm/conf/IMX6 user/ngie/more-tests2/sys/arm/conf/PANDABOARD user/ngie/more-tests2/sys/arm/conf/RK3188 user/ngie/more-tests2/sys/arm/conf/RPI2 user/ngie/more-tests2/sys/arm/conf/SOCKIT.common user/ngie/more-tests2/sys/arm/conf/VERSATILEPB user/ngie/more-tests2/sys/arm/conf/VIRT user/ngie/more-tests2/sys/arm/conf/VYBRID user/ngie/more-tests2/sys/arm/conf/ZEDBOARD user/ngie/more-tests2/sys/arm/freescale/imx/files.imx5 user/ngie/more-tests2/sys/arm/freescale/imx/files.imx6 user/ngie/more-tests2/sys/arm/freescale/imx/imx_machdep.c user/ngie/more-tests2/sys/arm/freescale/imx/std.imx51 user/ngie/more-tests2/sys/arm/freescale/imx/std.imx53 user/ngie/more-tests2/sys/arm/freescale/imx/std.imx6 user/ngie/more-tests2/sys/arm/freescale/vybrid/files.vybrid user/ngie/more-tests2/sys/arm/freescale/vybrid/std.vybrid user/ngie/more-tests2/sys/arm/include/bus.h user/ngie/more-tests2/sys/arm/lpc/files.lpc user/ngie/more-tests2/sys/arm/mv/armadaxp/std.armadaxp user/ngie/more-tests2/sys/arm/mv/files.mv user/ngie/more-tests2/sys/arm/qemu/files.qemu user/ngie/more-tests2/sys/arm/qemu/std.virt user/ngie/more-tests2/sys/arm/rockchip/files.rk30xx user/ngie/more-tests2/sys/arm/rockchip/std.rk30xx user/ngie/more-tests2/sys/arm/samsung/exynos/files.exynos5 user/ngie/more-tests2/sys/arm/samsung/exynos/std.exynos5250 user/ngie/more-tests2/sys/arm/samsung/exynos/std.exynos5420 user/ngie/more-tests2/sys/arm/ti/am335x/files.am335x user/ngie/more-tests2/sys/arm/ti/am335x/std.am335x user/ngie/more-tests2/sys/arm/ti/files.ti user/ngie/more-tests2/sys/arm/ti/omap4/files.omap4 user/ngie/more-tests2/sys/arm/ti/omap4/std.omap4 user/ngie/more-tests2/sys/arm/versatile/files.versatile user/ngie/more-tests2/sys/arm/versatile/versatile_pci.c user/ngie/more-tests2/sys/arm/xilinx/files.zynq7 user/ngie/more-tests2/sys/arm/xilinx/std.zynq7 user/ngie/more-tests2/sys/arm/xscale/i80321/files.i80219 user/ngie/more-tests2/sys/arm/xscale/i80321/files.i80321 user/ngie/more-tests2/sys/arm/xscale/i8134x/files.i81342 user/ngie/more-tests2/sys/arm/xscale/ixp425/files.ixp425 user/ngie/more-tests2/sys/arm/xscale/pxa/files.pxa user/ngie/more-tests2/sys/arm64/arm64/busdma_bounce.c user/ngie/more-tests2/sys/boot/i386/Makefile user/ngie/more-tests2/sys/boot/i386/boot0/Makefile user/ngie/more-tests2/sys/boot/powerpc/kboot/Makefile user/ngie/more-tests2/sys/boot/uboot/common/main.c user/ngie/more-tests2/sys/cam/scsi/scsi_enc.c user/ngie/more-tests2/sys/cam/scsi/scsi_enc.h user/ngie/more-tests2/sys/cam/scsi/scsi_enc_ses.c user/ngie/more-tests2/sys/cddl/dev/dtrace/amd64/dtrace_isa.c user/ngie/more-tests2/sys/compat/ia32/ia32_sysvec.c user/ngie/more-tests2/sys/conf/NOTES user/ngie/more-tests2/sys/conf/files user/ngie/more-tests2/sys/conf/files.arm user/ngie/more-tests2/sys/conf/kern.opts.mk user/ngie/more-tests2/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c user/ngie/more-tests2/sys/dev/ath/if_ath.c user/ngie/more-tests2/sys/dev/ath/if_ath_misc.h user/ngie/more-tests2/sys/dev/ath/if_ath_rx.c user/ngie/more-tests2/sys/dev/ath/if_ath_rx_edma.c user/ngie/more-tests2/sys/dev/ath/if_ath_tx_edma.c user/ngie/more-tests2/sys/dev/de/if_de.c user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c user/ngie/more-tests2/sys/dev/isp/isp.c user/ngie/more-tests2/sys/dev/isp/isp_freebsd.c user/ngie/more-tests2/sys/dev/isp/isp_freebsd.h user/ngie/more-tests2/sys/dev/isp/isp_library.c user/ngie/more-tests2/sys/dev/isp/isp_library.h user/ngie/more-tests2/sys/dev/isp/isp_pci.c user/ngie/more-tests2/sys/dev/isp/isp_sbus.c user/ngie/more-tests2/sys/dev/isp/isp_target.c user/ngie/more-tests2/sys/dev/isp/ispmbox.h user/ngie/more-tests2/sys/dev/isp/ispvar.h user/ngie/more-tests2/sys/dev/ispfw/asm_1040.h user/ngie/more-tests2/sys/dev/ispfw/asm_1080.h user/ngie/more-tests2/sys/dev/ispfw/asm_12160.h user/ngie/more-tests2/sys/dev/ispfw/asm_2200.h user/ngie/more-tests2/sys/dev/ispfw/asm_2300.h user/ngie/more-tests2/sys/dev/ispfw/asm_2322.h user/ngie/more-tests2/sys/dev/ispfw/ispfw.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/en.h user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/tcp_tlro.c user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/tcp_tlro.h user/ngie/more-tests2/sys/dev/ntb/if_ntb/if_ntb.c user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.h user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_regs.h user/ngie/more-tests2/sys/dev/pci/pcireg.h user/ngie/more-tests2/sys/dev/pci/pcivar.h user/ngie/more-tests2/sys/dev/usb/controller/uhci.h user/ngie/more-tests2/sys/dev/usb/input/ukbd.c user/ngie/more-tests2/sys/fs/nfs/nfs_var.h user/ngie/more-tests2/sys/fs/nfsclient/nfs_clrpcops.c user/ngie/more-tests2/sys/fs/nfsserver/nfs_nfsdkrpc.c user/ngie/more-tests2/sys/fs/nfsserver/nfs_nfsdstate.c user/ngie/more-tests2/sys/i386/i386/elf_machdep.c user/ngie/more-tests2/sys/kern/kern_malloc.c user/ngie/more-tests2/sys/kern/kern_sharedpage.c user/ngie/more-tests2/sys/kern/subr_prf.c user/ngie/more-tests2/sys/kern/subr_stack.c user/ngie/more-tests2/sys/kern/subr_witness.c user/ngie/more-tests2/sys/kern/vfs_subr.c user/ngie/more-tests2/sys/kern/vfs_syscalls.c user/ngie/more-tests2/sys/mips/conf/ALFA_HORNET_UB user/ngie/more-tests2/sys/mips/conf/AP121 user/ngie/more-tests2/sys/mips/conf/AP135 user/ngie/more-tests2/sys/mips/conf/AP143 user/ngie/more-tests2/sys/mips/conf/AP91 user/ngie/more-tests2/sys/mips/conf/AP93 user/ngie/more-tests2/sys/mips/conf/AP94 user/ngie/more-tests2/sys/mips/conf/AP96 user/ngie/more-tests2/sys/mips/conf/BERI_DE4_MDROOT user/ngie/more-tests2/sys/mips/conf/BERI_DE4_SDROOT user/ngie/more-tests2/sys/mips/conf/BERI_SIM_MDROOT user/ngie/more-tests2/sys/mips/conf/BERI_SIM_SDROOT user/ngie/more-tests2/sys/mips/conf/BERI_SIM_VIRTIO user/ngie/more-tests2/sys/mips/conf/CARAMBOLA2 user/ngie/more-tests2/sys/mips/conf/DB120 user/ngie/more-tests2/sys/mips/conf/DIR-655A1 user/ngie/more-tests2/sys/mips/conf/DIR-825B1 user/ngie/more-tests2/sys/mips/conf/DIR-825C1 user/ngie/more-tests2/sys/mips/conf/ENH200 user/ngie/more-tests2/sys/mips/conf/ONIONOMEGA user/ngie/more-tests2/sys/mips/conf/PB47 user/ngie/more-tests2/sys/mips/conf/PICOSTATION_M2HP user/ngie/more-tests2/sys/mips/conf/ROUTERSTATION user/ngie/more-tests2/sys/mips/conf/ROUTERSTATION_MFS user/ngie/more-tests2/sys/mips/conf/RSPRO user/ngie/more-tests2/sys/mips/conf/RSPRO_MFS user/ngie/more-tests2/sys/mips/conf/TL-ARCHERC7V2 user/ngie/more-tests2/sys/mips/conf/TL-WDR4300 user/ngie/more-tests2/sys/mips/conf/TL-WR1043NDv2 user/ngie/more-tests2/sys/mips/conf/TL-WR740Nv4 user/ngie/more-tests2/sys/mips/conf/TP-MR3020 user/ngie/more-tests2/sys/mips/conf/TP-WN1043ND user/ngie/more-tests2/sys/mips/conf/WZR-300HP user/ngie/more-tests2/sys/mips/conf/WZR-HPAG300H user/ngie/more-tests2/sys/mips/malta/malta_machdep.c user/ngie/more-tests2/sys/modules/Makefile user/ngie/more-tests2/sys/modules/ath/Makefile user/ngie/more-tests2/sys/modules/cryptodev/Makefile user/ngie/more-tests2/sys/modules/ipoib/Makefile user/ngie/more-tests2/sys/modules/ispfw/Makefile user/ngie/more-tests2/sys/modules/linux64/Makefile user/ngie/more-tests2/sys/netinet/in_mcast.c user/ngie/more-tests2/sys/netinet/sctp_pcb.c user/ngie/more-tests2/sys/netinet/sctp_usrreq.c user/ngie/more-tests2/sys/netinet6/in6_mcast.c user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_private.h user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_sockopt.c user/ngie/more-tests2/sys/ofed/drivers/net/mlx4/cmd.c user/ngie/more-tests2/sys/opencrypto/cryptodev.c user/ngie/more-tests2/sys/powerpc/booke/pmap.c user/ngie/more-tests2/sys/powerpc/include/asm.h user/ngie/more-tests2/sys/powerpc/include/bus.h user/ngie/more-tests2/sys/powerpc/include/md_var.h user/ngie/more-tests2/sys/powerpc/include/profile.h user/ngie/more-tests2/sys/powerpc/mpc85xx/pci_mpc85xx.c user/ngie/more-tests2/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c user/ngie/more-tests2/sys/powerpc/powerpc/elf64_machdep.c user/ngie/more-tests2/sys/powerpc/powerpc/exec_machdep.c user/ngie/more-tests2/sys/powerpc/powerpc/sigcode64.S user/ngie/more-tests2/sys/rpc/svc.c user/ngie/more-tests2/sys/sparc64/include/md_var.h user/ngie/more-tests2/sys/sparc64/sparc64/machdep.c user/ngie/more-tests2/sys/sparc64/sparc64/mp_machdep.c user/ngie/more-tests2/sys/sys/mount.h user/ngie/more-tests2/sys/sys/sysent.h user/ngie/more-tests2/sys/sys/systm.h user/ngie/more-tests2/sys/sys/vdso.h user/ngie/more-tests2/sys/vm/uma_core.c user/ngie/more-tests2/sys/vm/vm_pageout.c user/ngie/more-tests2/sys/vm/vnode_pager.c user/ngie/more-tests2/sys/x86/x86/busdma_bounce.c user/ngie/more-tests2/targets/pseudo/userland/Makefile.depend user/ngie/more-tests2/targets/pseudo/userland/misc/Makefile.depend user/ngie/more-tests2/tests/Makefile user/ngie/more-tests2/tests/README user/ngie/more-tests2/tests/sys/kern/Makefile user/ngie/more-tests2/tests/sys/kern/acct/Makefile user/ngie/more-tests2/tools/debugscripts/kld_deb.py user/ngie/more-tests2/tools/regression/netinet/ip_id_period/ip_id_period.py user/ngie/more-tests2/tools/sched/schedgraph.py user/ngie/more-tests2/tools/tools/nanobsd/defaults.sh user/ngie/more-tests2/tools/tools/shlib-compat/shlib-compat.py user/ngie/more-tests2/usr.bin/Makefile user/ngie/more-tests2/usr.bin/bc/bc.1 user/ngie/more-tests2/usr.bin/bc/bc.y user/ngie/more-tests2/usr.bin/bc/extern.h user/ngie/more-tests2/usr.bin/bc/tty.c user/ngie/more-tests2/usr.bin/fortune/tools/do_uniq.py user/ngie/more-tests2/usr.bin/m4/eval.c user/ngie/more-tests2/usr.bin/m4/extern.h user/ngie/more-tests2/usr.bin/m4/m4.1 user/ngie/more-tests2/usr.bin/m4/main.c user/ngie/more-tests2/usr.bin/m4/mdef.h user/ngie/more-tests2/usr.bin/m4/pathnames.h user/ngie/more-tests2/usr.bin/ministat/ministat.c user/ngie/more-tests2/usr.bin/netstat/if.c user/ngie/more-tests2/usr.bin/netstat/route.c user/ngie/more-tests2/usr.bin/vacation/Makefile.depend user/ngie/more-tests2/usr.bin/vmstat/Makefile user/ngie/more-tests2/usr.bin/vmstat/vmstat.8 user/ngie/more-tests2/usr.bin/vmstat/vmstat.c user/ngie/more-tests2/usr.bin/xinstall/xinstall.c user/ngie/more-tests2/usr.sbin/Makefile user/ngie/more-tests2/usr.sbin/Makefile.mips user/ngie/more-tests2/usr.sbin/bluetooth/bthidd/kbd.c user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile user/ngie/more-tests2/usr.sbin/editmap/Makefile.depend user/ngie/more-tests2/usr.sbin/mailstats/Makefile.depend user/ngie/more-tests2/usr.sbin/makefs/ffs/newfs_extern.h user/ngie/more-tests2/usr.sbin/makemap/Makefile.depend user/ngie/more-tests2/usr.sbin/pciconf/pciconf.8 user/ngie/more-tests2/usr.sbin/pciconf/pciconf.c user/ngie/more-tests2/usr.sbin/praliases/Makefile.depend user/ngie/more-tests2/usr.sbin/uathload/Makefile Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/cddl/ (props changed) user/ngie/more-tests2/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/ (props changed) user/ngie/more-tests2/contrib/sendmail/ (props changed) user/ngie/more-tests2/contrib/xz/ (props changed) user/ngie/more-tests2/crypto/openssh/ (props changed) user/ngie/more-tests2/gnu/usr.bin/binutils/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/sbin/dumpon/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/boot/powerpc/kboot/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) user/ngie/more-tests2/sys/dev/hyperv/ (props changed) user/ngie/more-tests2/targets/ (props changed) Modified: user/ngie/more-tests2/ObsoleteFiles.inc ============================================================================== --- user/ngie/more-tests2/ObsoleteFiles.inc Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/ObsoleteFiles.inc Tue Nov 24 05:12:40 2015 (r291236) @@ -142,10 +142,6 @@ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES OLD_DIRS+=usr/share/locale/sr_YU.UTF-8 -OLD_FILES+=usr/bin/colldef -OLD_FILES+=usr/share/man/man1/colldef.1.gz -OLD_FILES+=usr/bin/mklocale -OLD_FILES+=usr/share/man/man1/mklocale.1.gz # 20151101: added missing _test suffix on multiple tests in lib/libc OLD_FILES+=usr/tests/lib/libc/c063/faccessat OLD_FILES+=usr/tests/lib/libc/c063/fchmodat Modified: user/ngie/more-tests2/bin/rmail/Makefile.depend ============================================================================== --- user/ngie/more-tests2/bin/rmail/Makefile.depend Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/bin/rmail/Makefile.depend Tue Nov 24 05:12:40 2015 (r291236) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libsm \ - lib/libutil \ .include Modified: user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Tue Nov 24 05:12:40 2015 (r291236) @@ -117,7 +117,7 @@ .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm set -.Ar property Ns = Ns Ar value Oc ... +.Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ... .Nm .Cm get @@ -2123,7 +2123,7 @@ option, but sorts by property in descend .It Xo .Nm .Cm set -.Ar property Ns = Ns Ar value Oc ... +.Ar property Ns = Ns Ar value Oo Ar property Ns = Ns Ar value Oc Ns ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Xc .Pp Modified: user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h ============================================================================== --- user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/sendmail/include/sm/conf.h Tue Nov 24 05:12:40 2015 (r291236) @@ -1019,7 +1019,9 @@ extern unsigned int sleepX __P((unsigned # if __FreeBSD__ >= 2 # include # if __FreeBSD_version >= 199512 /* 2.2-current when it appeared */ +# if __FreeBSD_version < 500012 # include +# endif # define SPT_TYPE SPT_BUILTIN # endif /* __FreeBSD_version >= 199512 */ # if __FreeBSD_version >= 222000 /* 2.2.2-release and later */ Modified: user/ngie/more-tests2/contrib/xz/ChangeLog ============================================================================== --- user/ngie/more-tests2/contrib/xz/ChangeLog Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/ChangeLog Tue Nov 24 05:12:40 2015 (r291236) @@ -1,3 +1,313 @@ +commit 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0a +Author: Lasse Collin +Date: 2015-09-29 13:59:35 +0300 + + Bump version and soname for 5.2.2. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cbe0cec8476bdd0416c7ca9bc83895c9bea1cf78 +Author: Lasse Collin +Date: 2015-09-29 13:57:28 +0300 + + Update NEWS for 5.2.2. + + NEWS | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 49427ce7eececdd18bbd35dab23c81910d083e1c +Author: Andre Noll +Date: 2015-05-28 15:50:00 +0200 + + Fix typo in German translation. + + As pointed out by Robert Pollak, there's a typo in the German + translation of the compression preset option (-0 ... -9) help text. + "The compressor" translates to "der Komprimierer", and the genitive + form is "des Komprimierers". The old word makes no sense at all. + + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 608d6f06c940e7f28c25de005e8b99bdff42d27c +Author: Hauke Henningsen +Date: 2015-08-17 04:59:54 +0200 + + Update German translation, mostly wrt orthography + + Provide an update of the German translation. + * A lot of compound words were previously written with spaces, while + German orthography is relatively clear in that the components + should not be separated. + * When referring to the actual process of (de)compression rather than the + concept, replace “(De-)Kompression” with “(De-)Komprimierung”. + Previously, both forms were used in this context and are now used in a + manner consistent with “Komprimierung” being more likely to refer to + a process. + * Consistently translate “standard input”/“output” + * Use “Zeichen” instead of false friend “Charakter” for “character” + * Insert commas around relative clauses (as required in German) + * Some other minor corrections + * Capitalize “ß” as “ẞ” + * Consistently start option descriptions in --help with capital letters + + Acked-By: Andre Noll + + * Update after msgmerge + + po/de.po | 383 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 196 insertions(+), 187 deletions(-) + +commit c8988414e5b67b8ef2fe0ba7b1ccdd0ec73c60d3 +Author: Lasse Collin +Date: 2015-08-11 13:23:04 +0300 + + Build: Minor Cygwin cleanup. + + Some tests used "cygwin*" and some used "cygwin". I changed + them all to use "cygwin". Shouldn't affect anything in practice. + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 85a6dfed53477906bfe9a7c0123dd412e391cb48 +Author: Lasse Collin +Date: 2015-08-11 13:21:52 +0300 + + Build: Support building of MSYS2 binaries. + + configure.ac | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 77f270be8432df2e4516a0c48814b6976d6618c5 +Author: Lasse Collin +Date: 2015-08-09 21:06:26 +0300 + + Windows: Define DLL_EXPORT when building liblzma.dll with MSVC. + + src/liblzma/common/common.h uses it to set __declspec(dllexport) + for the API symbols. + + Thanks to Adam Walling. + + windows/liblzma_dll.vcxproj | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8c975446c5903090a5a8493b5b96b71003056a88 +Author: Lasse Collin +Date: 2015-08-09 21:02:20 +0300 + + Windows: Omit unneeded header files from MSVC project files. + + windows/liblzma.vcxproj | 5 ----- + windows/liblzma_dll.vcxproj | 5 ----- + 2 files changed, 10 deletions(-) + +commit 119a00434954726ca58e4a578e6469f530fca30e +Author: Lasse Collin +Date: 2015-07-12 20:48:19 +0300 + + liblzma: A MSVC-specific hack isn't needed with MSVC 2013 and newer. + + src/liblzma/api/lzma.h | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit d4e7c557fcab353539c9481a8d95cb04bcb15c7c +Author: Lasse Collin +Date: 2015-06-19 20:38:55 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 98001740ca56c894a7bd32eb47e9857a8a7d878d +Author: Lasse Collin +Date: 2015-06-19 20:21:30 +0300 + + Windows: Update the docs. + + INSTALL | 29 ++++++---- + windows/INSTALL-MSVC.txt | 47 +++++++++++++++ + windows/INSTALL-MinGW.txt | 138 ++++++++++++++++++++++++++++++++++++++++++++ + windows/INSTALL-Windows.txt | 138 -------------------------------------------- + 4 files changed, 204 insertions(+), 148 deletions(-) + +commit 28195e4c877007cc760ecea1d17f740693d66873 +Author: Lasse Collin +Date: 2015-06-19 17:25:31 +0300 + + Windows: Add MSVC project files for building liblzma. + + Thanks to Adam Walling for creating these files. + + windows/liblzma.vcxproj | 359 ++++++++++++++++++++++++++++++++++++++++ + windows/liblzma_dll.vcxproj | 388 ++++++++++++++++++++++++++++++++++++++++++++ + windows/xz_win.sln | 48 ++++++ + 3 files changed, 795 insertions(+) + +commit 960440f3230dc628f6966d9f7614fc1b28baf44e +Author: Lasse Collin +Date: 2015-05-13 20:57:55 +0300 + + Tests: Fix a memory leak in test_bcj_exact_size. + + Thanks to Cristian Rodríguez. + + tests/test_bcj_exact_size.c | 1 + + 1 file changed, 1 insertion(+) + +commit 68cd35acafbdcdf4e8ea8b5bb843c736939d6f8b +Author: Lasse Collin +Date: 2015-05-12 18:08:24 +0300 + + Fix NEWS about threading in 5.2.0. + + Thanks to Andy Hochhaus. + + NEWS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ff96ed6d25786728356017a13baf8c14731b4f1e +Author: Lasse Collin +Date: 2015-05-11 21:26:16 +0300 + + xz: Document that threaded decompression hasn't been implemented yet. + + src/xz/xz.1 | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 00d37b64a64ea8597fd2422d5187afd761ab9531 +Author: Lasse Collin +Date: 2015-04-20 20:20:29 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit db190a832c49ca3aed6d69cc992fa5583cae7b11 +Author: Lasse Collin +Date: 2015-04-20 19:59:18 +0300 + + Revert "xz: Use pipe2() if available." + + This reverts commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd. + It is a problem when libc has pipe2() but the kernel is too + old to have pipe2() and thus pipe2() fails. In xz it's pointless + to have a fallback for non-functioning pipe2(); it's better to + avoid pipe2() completely. + + Thanks to Michael Fox for the bug report. + + configure.ac | 4 ++-- + src/xz/file_io.c | 9 +-------- + 2 files changed, 3 insertions(+), 10 deletions(-) + +commit eccd8155e107c5ada03d13e7730675cdf1a44ddc +Author: Lasse Collin +Date: 2015-03-29 22:14:47 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 25263fd9e7a8a913395cb93d7c104cd48c2b4a00 +Author: Lasse Collin +Date: 2015-03-29 22:13:48 +0300 + + Fix the detection of installed RAM on QNX. + + The earlier version compiled but didn't actually work + since sysconf(_SC_PHYS_PAGES) always fails (or so I was told). + + Thanks to Ole André Vadla Ravnås for the patch and testing. + + m4/tuklib_physmem.m4 | 6 +++--- + src/common/tuklib_physmem.c | 14 +++++++++++++- + 2 files changed, 16 insertions(+), 4 deletions(-) + +commit 4c544d2410903d38402221cb783ed85585b6a007 +Author: Lasse Collin +Date: 2015-03-27 22:39:07 +0200 + + Fix CPU core count detection on QNX. + + It tried to use sysctl() on QNX but + - it broke the build because sysctl() needs -lsocket on QNX; + - sysctl() doesn't work for detecting the core count on QNX + even if it compiled. + + sysconf() works. An alternative would have been to use + QNX-specific SYSPAGE_ENTRY(num_cpu) from . + + Thanks to Ole André Vadla Ravnås. + + m4/tuklib_cpucores.m4 | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +commit e0ea6737b03e83ccaff4514d00e31bb926f8f0f3 +Author: Lasse Collin +Date: 2015-03-07 22:05:57 +0200 + + xz: size_t/uint32_t cleanup in options.c. + + src/xz/options.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8bcca29a65335fd679c13814b70b35b68fa5daed +Author: Lasse Collin +Date: 2015-03-07 22:04:23 +0200 + + xz: Fix a comment and silence a warning in message.c. + + src/xz/message.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f243f5f44c6b19a7c289a0ec73a03ee08364cb5b +Author: Lasse Collin +Date: 2015-03-07 22:01:00 +0200 + + liblzma: Silence more uint32_t vs. size_t warnings. + + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7f0a4c50f4a374c40acf4b86848f301ad1e82d34 +Author: Lasse Collin +Date: 2015-03-07 19:54:00 +0200 + + xz: Make arg_count an unsigned int to silence a warning. + + Actually the value of arg_count cannot exceed INT_MAX + but it's nicer as an unsigned int. + + src/xz/args.h | 2 +- + src/xz/main.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f6ec46801588b1be29c07c9db98558b521304002 +Author: Lasse Collin +Date: 2015-03-07 19:33:17 +0200 + + liblzma: Fix a warning in index.c. + + src/liblzma/common/index.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a24518971cc621315af142dd3bb7614fab04ad27 +Author: Lasse Collin +Date: 2015-02-26 20:46:14 +0200 + + Build: Fix a CR+LF problem when running autoreconf -fi on OS/2. + + build-aux/version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit dec11497a71518423b5ff0e759100cf8aadf6c7b Author: Lasse Collin Date: 2015-02-26 16:53:44 +0200 Modified: user/ngie/more-tests2/contrib/xz/THANKS ============================================================================== --- user/ngie/more-tests2/contrib/xz/THANKS Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/THANKS Tue Nov 24 05:12:40 2015 (r291236) @@ -21,6 +21,7 @@ has been important. :-) In alphabetical - Milo Casagrande - Marek Černocký - Tomer Chachamu + - Gabi Davar - Chris Donawa - Andrew Dudman - Markus Duft @@ -29,6 +30,7 @@ has been important. :-) In alphabetical - Gilles Espinasse - Denis Excoffier - Michael Felt + - Michael Fox - Mike Frysinger - Daniel Richard G. - Bill Glessner @@ -74,6 +76,7 @@ has been important. :-) In alphabetical - Mikko Pouru - Trần Ngọc Quân - Pavel Raiskup + - Ole André Vadla Ravnås - Robert Readman - Bernhard Reutner-Fischer - Eric S. Raymond @@ -95,6 +98,7 @@ has been important. :-) In alphabetical - Alexey Tourbin - Patrick J. Volkerding - Martin Väth + - Adam Walling - Christian Weisgerber - Bert Wesarg - Fredrik Wikstrom Modified: user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/common/tuklib_physmem.c Tue Nov 24 05:12:40 2015 (r291236) @@ -37,7 +37,10 @@ # define __USE_INLINE__ # include -// AIX +#elif defined(__QNX__) +# include +# include + #elif defined(TUKLIB_PHYSMEM_AIX) # include @@ -126,6 +129,15 @@ tuklib_physmem(void) #elif defined(AMIGA) || defined(__AROS__) ret = AvailMem(MEMF_TOTAL); +#elif defined(__QNX__) + const struct asinfo_entry *entries = SYSPAGE_ENTRY(asinfo); + size_t count = SYSPAGE_ENTRY_SIZE(asinfo) / sizeof(struct asinfo_entry); + const char *strings = SYSPAGE_ENTRY(strings)->data; + + for (size_t i = 0; i < count; ++i) + if (strcmp(strings + entries[i].name, "ram") == 0) + ret += entries[i].end - entries[i].start + 1; + #elif defined(TUKLIB_PHYSMEM_AIX) ret = _system_configuration.physmem; Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma.h Tue Nov 24 05:12:40 2015 (r291236) @@ -82,12 +82,20 @@ # if !defined(UINT32_C) || !defined(UINT64_C) \ || !defined(UINT32_MAX) || !defined(UINT64_MAX) /* - * MSVC has no C99 support, and thus it cannot be used to - * compile liblzma. The liblzma API has to still be usable - * from MSVC, so we need to define the required standard - * integer types here. + * MSVC versions older than 2013 have no C99 support, and + * thus they cannot be used to compile liblzma. Using an + * existing liblzma.dll with old MSVC can work though(*), + * but we need to define the required standard integer + * types here in a MSVC-specific way. + * + * (*) If you do this, the existing liblzma.dll probably uses + * a different runtime library than your MSVC-built + * application. Mixing runtimes is generally bad, but + * in this case it should work as long as you avoid + * the few rarely-needed liblzma functions that allocate + * memory and expect the caller to free it using free(). */ -# if defined(_WIN32) && defined(_MSC_VER) +# if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1800 typedef unsigned __int8 uint8_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/liblzma/api/lzma/version.h Tue Nov 24 05:12:40 2015 (r291236) @@ -22,7 +22,7 @@ */ #define LZMA_VERSION_MAJOR 5 #define LZMA_VERSION_MINOR 2 -#define LZMA_VERSION_PATCH 1 +#define LZMA_VERSION_PATCH 2 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE #ifndef LZMA_VERSION_COMMIT Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/liblzma/common/index.c Tue Nov 24 05:12:40 2015 (r291236) @@ -339,7 +339,7 @@ index_tree_locate(const index_tree *tree /// Allocate and initialize a new Stream using the given base offsets. static index_stream * index_stream_init(lzma_vli compressed_base, lzma_vli uncompressed_base, - lzma_vli stream_number, lzma_vli block_number_base, + uint32_t stream_number, lzma_vli block_number_base, const lzma_allocator *allocator) { index_stream *s = lzma_alloc(sizeof(index_stream), allocator); @@ -1008,6 +1008,8 @@ iter_set_info(lzma_index_iter *iter) iter->internal[ITER_GROUP].p = NULL; } + // NOTE: lzma_index_iter.stream.number is lzma_vli but we use uint32_t + // internally. iter->stream.number = stream->number; iter->stream.block_count = stream->record_count; iter->stream.compressed_offset = stream->node.compressed_base; Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/liblzma/lz/lz_encoder.c Tue Nov 24 05:12:40 2015 (r291236) @@ -139,7 +139,7 @@ fill_window(lzma_coder *coder, const lzm && coder->mf.read_pos < coder->mf.read_limit) { // Match finder may update coder->pending and expects it to // start from zero, so use a temporary variable. - const size_t pending = coder->mf.pending; + const uint32_t pending = coder->mf.pending; coder->mf.pending = 0; // Rewind read_pos so that the match finder can hash Modified: user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/liblzma/lzma/lzma_encoder.c Tue Nov 24 05:12:40 2015 (r291236) @@ -464,7 +464,7 @@ length_encoder_reset(lzma_length_encoder bittree_reset(lencoder->high, LEN_HIGH_BITS); if (!fast_mode) - for (size_t pos_state = 0; pos_state < num_pos_states; + for (uint32_t pos_state = 0; pos_state < num_pos_states; ++pos_state) length_update_prices(lencoder, pos_state); Modified: user/ngie/more-tests2/contrib/xz/src/xz/args.h ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/xz/args.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/xz/args.h Tue Nov 24 05:12:40 2015 (r291236) @@ -15,7 +15,7 @@ typedef struct { char **arg_names; /// Number of filenames from command line - size_t arg_count; + unsigned int arg_count; /// Name of the file from which to read filenames. This is NULL /// if --files or --files0 was not used. Modified: user/ngie/more-tests2/contrib/xz/src/xz/file_io.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/xz/file_io.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/xz/file_io.c Tue Nov 24 05:12:40 2015 (r291236) @@ -82,13 +82,7 @@ io_init(void) // we are root. warn_fchown = geteuid() == 0; - // Create a pipe for the self-pipe trick. If pipe2() is available, - // we can avoid the fcntl() calls. -# ifdef HAVE_PIPE2 - if (pipe2(user_abort_pipe, O_NONBLOCK)) - message_fatal(_("Error creating a pipe: %s"), - strerror(errno)); -# else + // Create a pipe for the self-pipe trick. if (pipe(user_abort_pipe)) message_fatal(_("Error creating a pipe: %s"), strerror(errno)); @@ -101,7 +95,6 @@ io_init(void) message_fatal(_("Error creating a pipe: %s"), strerror(errno)); } -# endif #endif #ifdef __DJGPP__ Modified: user/ngie/more-tests2/contrib/xz/src/xz/main.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/xz/main.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/xz/main.c Tue Nov 24 05:12:40 2015 (r291236) @@ -212,7 +212,7 @@ main(int argc, char **argv) // Process the files given on the command line. Note that if no names // were given, args_parse() gave us a fake "-" filename. - for (size_t i = 0; i < args.arg_count && !user_abort; ++i) { + for (unsigned i = 0; i < args.arg_count && !user_abort; ++i) { if (strcmp("-", args.arg_names[i]) == 0) { // Processing from stdin to stdout. Check that we // aren't writing compressed data to a terminal or Modified: user/ngie/more-tests2/contrib/xz/src/xz/message.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/xz/message.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/xz/message.c Tue Nov 24 05:12:40 2015 (r291236) @@ -381,7 +381,7 @@ progress_speed(uint64_t uncompressed_pos } -/// Make a string indicating elapsed or remaining time. The format is either +/// Make a string indicating elapsed time. The format is either /// M:SS or H:MM:SS depending on if the time is an hour or more. static const char * progress_time(uint64_t mseconds) @@ -389,7 +389,8 @@ progress_time(uint64_t mseconds) // 9999 hours = 416 days static char buf[sizeof("9999:59:59")]; - uint32_t seconds = mseconds / 1000; + // 32-bit variable is enough for elapsed time (136 years). + uint32_t seconds = (uint32_t)(mseconds / 1000); // Don't show anything if the time is zero or ridiculously big. if (seconds == 0 || seconds > ((9999 * 60) + 59) * 60 + 59) Modified: user/ngie/more-tests2/contrib/xz/src/xz/options.c ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/xz/options.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/xz/options.c Tue Nov 24 05:12:40 2015 (r291236) @@ -59,7 +59,7 @@ typedef struct { static void parse_options(const char *str, const option_map *opts, void (*set)(void *filter_options, - uint32_t key, uint64_t value, const char *valuestr), + unsigned key, uint64_t value, const char *valuestr), void *filter_options) { if (str == NULL || str[0] == '\0') @@ -87,7 +87,7 @@ parse_options(const char *str, const opt "pairs separated with commas"), str); // Look for the option name from the option map. - size_t i = 0; + unsigned i = 0; while (true) { if (opts[i].name == NULL) message_fatal(_("%s: Invalid option name"), @@ -103,7 +103,7 @@ parse_options(const char *str, const opt if (opts[i].map != NULL) { // value is a string which we should map // to an integer. - size_t j; + unsigned j; for (j = 0; opts[i].map[j].name != NULL; ++j) { if (strcmp(opts[i].map[j].name, value) == 0) break; @@ -149,7 +149,7 @@ enum { static void -set_delta(void *options, uint32_t key, uint64_t value, +set_delta(void *options, unsigned key, uint64_t value, const char *valuestr lzma_attribute((__unused__))) { lzma_options_delta *opt = options; @@ -193,7 +193,7 @@ enum { static void -set_bcj(void *options, uint32_t key, uint64_t value, +set_bcj(void *options, unsigned key, uint64_t value, const char *valuestr lzma_attribute((__unused__))) { lzma_options_bcj *opt = options; @@ -249,7 +249,7 @@ error_lzma_preset(const char *valuestr) static void -set_lzma(void *options, uint32_t key, uint64_t value, const char *valuestr) +set_lzma(void *options, unsigned key, uint64_t value, const char *valuestr) { lzma_options_lzma *opt = options; Modified: user/ngie/more-tests2/contrib/xz/src/xz/xz.1 ============================================================================== --- user/ngie/more-tests2/contrib/xz/src/xz/xz.1 Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/contrib/xz/src/xz/xz.1 Tue Nov 24 05:12:40 2015 (r291236) @@ -5,7 +5,7 @@ .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZ 1 "2014-12-16" "Tukaani" "XZ Utils" +.TH XZ 1 "2015-05-11" "Tukaani" "XZ Utils" . .SH NAME xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files @@ -1055,6 +1055,14 @@ The default block size depends on the co can be overriden with the .BI \-\-block\-size= size option. +.IP "" +Threaded decompression hasn't been implemented yet. +It will only work on files that contain multiple blocks +with size information in block headers. +All files compressed in multi-threaded mode meet this condition, +but files compressed in single-threaded mode don't even if +.BI \-\-block\-size= size +is used. . .SS "Custom compressor filter chains" A custom filter chain allows specifying Modified: user/ngie/more-tests2/crypto/openssh/README.hpn ============================================================================== --- user/ngie/more-tests2/crypto/openssh/README.hpn Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/README.hpn Tue Nov 24 05:12:40 2015 (r291236) @@ -1,14 +1,5 @@ Notes: -NONE CIPHER: - To use the NONE option you must have the NoneEnabled switch set on the server - and you MUST have *both* NoneEnabled and NoneSwitch set to yes on the client. - The NONE feature works with ALL ssh subsystems (as far as we can tell) - as long as there is no tty allocated. - If a user uses the -T switch to prevent a tty being created the NONE cipher - will be disabled. - - PERFORMANCE: The performance increase will only be as good as the network and TCP stack tuning on the reciever side of the connection allows. As a rule of thumb a @@ -93,22 +84,6 @@ HPN SPECIFIC CONFIGURATION OPTIONS: the throughput will be no more than n/RTT. The minimum buffer size is 1KB. Default is the current system wide TCP receive buffer size. -- NoneEnabled=[yes/no] client/server - Enable or disable the use of the None cipher. Care must always be used when - enabling this as it will allow users to send data in the clear. However, it - is important to note that authentication information remains encrypted even - if this option is enabled. Set to no by default. - -- NoneSwitch=[yes/no] client - Switch the encryption cipher being used to the None cipher after - authentication takes place. NoneEnabled must be enabled on both the client - and server side of the connection. When the connection switches to the NONE - cipher a warning is sent to STDERR. The connection attempt will fail with an - error if a client requests a NoneSwitch from the server that does not - explicitly have NoneEnabled set to yes. - Note: The NONE cipher cannot be used in interactive (shell) sessions and it - will fail silently. Set to no by default. - CREDITS: Modified: user/ngie/more-tests2/crypto/openssh/cipher.c ============================================================================== --- user/ngie/more-tests2/crypto/openssh/cipher.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/cipher.c Tue Nov 24 05:12:40 2015 (r291236) @@ -36,7 +36,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include @@ -225,12 +224,7 @@ ciphers_valid(const char *names) for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; (p = strsep(&cp, CIPHER_SEP))) { c = cipher_by_name(p); -#ifdef NONE_CIPHER_ENABLED - if (c == NULL || (c->number != SSH_CIPHER_SSH2 && - c->number != SSH_CIPHER_NONE)) { -#else - if (c == NULL || (c->number != SSH_CIPHER_SSH2)) { -#endif + if (c == NULL || c->number != SSH_CIPHER_SSH2) { debug("bad cipher %s [%s]", p, names); free(cipher_list); return 0; @@ -485,9 +479,6 @@ cipher_get_keyiv(CipherContext *cc, u_ch } switch (c->number) { -#ifdef NONE_CIPHER_ENABLED - case SSH_CIPHER_NONE: -#endif case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: @@ -527,9 +518,6 @@ cipher_set_keyiv(CipherContext *cc, u_ch return; switch (c->number) { -#ifdef NONE_CIPHER_ENABLED - case SSH_CIPHER_NONE: -#endif case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: Modified: user/ngie/more-tests2/crypto/openssh/kex.c ============================================================================== --- user/ngie/more-tests2/crypto/openssh/kex.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/kex.c Tue Nov 24 05:12:40 2015 (r291236) @@ -24,7 +24,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD$"); #include @@ -146,13 +145,8 @@ kex_names_valid(const char *names) return 1; } -/* put algorithm proposal into buffer. */ -#ifndef NONE_CIPHER_ENABLED +/* put algorithm proposal into buffer */ static void -#else -/* Also used in sshconnect2.c. */ -void -#endif kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX]) { u_int i; @@ -466,9 +460,6 @@ kex_choose_conf(Kex *kex) int nenc, nmac, ncomp; u_int mode, ctos, need, dh_need, authlen; int first_kex_follows, type; -#ifdef NONE_CIPHER_ENABLED - int auth_flag; -#endif my = kex_buf2prop(&kex->my, NULL); peer = kex_buf2prop(&kex->peer, &first_kex_follows); @@ -492,10 +483,6 @@ kex_choose_conf(Kex *kex) } /* Algorithm Negotiation */ -#ifdef NONE_CIPHER_ENABLED - auth_flag = packet_get_authentication_state(); - debug ("AUTH STATE is %d", auth_flag); -#endif for (mode = 0; mode < MODE_MAX; mode++) { newkeys = xcalloc(1, sizeof(*newkeys)); kex->newkeys[mode] = newkeys; @@ -510,17 +497,6 @@ kex_choose_conf(Kex *kex) if (authlen == 0) choose_mac(&newkeys->mac, cprop[nmac], sprop[nmac]); choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]); -#ifdef NONE_CIPHER_ENABLED - debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); - if (strcmp(newkeys->enc.name, "none") == 0) { - debug("Requesting NONE. Authflag is %d", auth_flag); - if (auth_flag == 1) - debug("None requested post authentication."); - else - fatal("Pre-authentication none cipher requests " - "are not allowed."); - } -#endif debug("kex: %s %s %s %s", ctos ? "client->server" : "server->client", newkeys->enc.name, Modified: user/ngie/more-tests2/crypto/openssh/kex.h ============================================================================== --- user/ngie/more-tests2/crypto/openssh/kex.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/kex.h Tue Nov 24 05:12:40 2015 (r291236) @@ -1,5 +1,4 @@ /* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -149,10 +148,6 @@ struct Kex { int kex_names_valid(const char *); char *kex_alg_list(char); -#ifdef NONE_CIPHER_ENABLED -void kex_prop2buf(Buffer *, char *[PROPOSAL_MAX]); -#endif - Kex *kex_setup(char *[PROPOSAL_MAX]); void kex_finish(Kex *); Modified: user/ngie/more-tests2/crypto/openssh/myproposal.h ============================================================================== --- user/ngie/more-tests2/crypto/openssh/myproposal.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/myproposal.h Tue Nov 24 05:12:40 2015 (r291236) @@ -1,5 +1,4 @@ /* $OpenBSD: myproposal.h,v 1.35 2013/12/06 13:39:49 markus Exp $ */ -/* $FreeBSD$ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -110,10 +109,6 @@ "chacha20-poly1305@openssh.com," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" -#ifdef NONE_CIPHER_ENABLED -#define KEX_ENCRYPT_INCLUDE_NONE KEX_DEFAULT_ENCRYPT \ - ",none" -#endif #define KEX_DEFAULT_MAC \ "hmac-md5-etm@openssh.com," \ Modified: user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h ============================================================================== --- user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/openbsd-compat/bsd-misc.h Tue Nov 24 05:12:40 2015 (r291236) @@ -20,7 +20,6 @@ #define _BSD_MISC_H #include "includes.h" -__RCSID("$FreeBSD$"); char *ssh_get_progname(char *); Modified: user/ngie/more-tests2/crypto/openssh/packet.c ============================================================================== --- user/ngie/more-tests2/crypto/openssh/packet.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/packet.c Tue Nov 24 05:12:40 2015 (r291236) @@ -202,9 +202,6 @@ struct session_state { }; static struct session_state *active_state, *backup_state; -#ifdef NONE_CIPHER_ENABLED -static int rekey_requested = 0; -#endif static struct session_state * alloc_session_state(void) @@ -1316,7 +1313,6 @@ packet_read_poll2(u_int32_t *seqnr_p) buffer_ptr(&active_state->input), block_size, 0, 0) != 0) fatal("Decryption integrity check failed"); cp = buffer_ptr(&active_state->incoming_packet); - active_state->packlen = get_u32(cp); if (active_state->packlen < 1 + 4 || active_state->packlen > PACKET_MAX_SIZE) { @@ -1943,26 +1939,12 @@ packet_send_ignore(int nbytes) } } -#ifdef NONE_CIPHER_ENABLED -void -packet_request_rekeying(void) -{ - rekey_requested = 1; -} -#endif - #define MAX_PACKETS (1U<<31) int packet_need_rekeying(void) { if (datafellows & SSH_BUG_NOREKEY) return 0; -#ifdef NONE_CIPHER_ENABLED - if (rekey_requested == 1) { - rekey_requested = 0; - return 1; - } -#endif return (active_state->p_send.packets > MAX_PACKETS) || (active_state->p_read.packets > MAX_PACKETS) || @@ -2074,11 +2056,3 @@ packet_restore_state(void) add_recv_bytes(len); } } - -#ifdef NONE_CIPHER_ENABLED -int -packet_get_authentication_state(void) -{ - return (active_state->after_authentication); -} -#endif Modified: user/ngie/more-tests2/crypto/openssh/packet.h ============================================================================== --- user/ngie/more-tests2/crypto/openssh/packet.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/packet.h Tue Nov 24 05:12:40 2015 (r291236) @@ -1,5 +1,4 @@ /* $OpenBSD: packet.h,v 1.59 2013/07/12 00:19:59 djm Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen @@ -39,9 +38,6 @@ void packet_set_interactive(int, int int packet_is_interactive(void); void packet_set_server(void); void packet_set_authenticated(void); -#ifdef NONE_CIPHER_ENABLED -int packet_get_authentication_state(void); -#endif void packet_start(u_char); void packet_put_char(int ch); @@ -119,9 +115,6 @@ do { \ } while (0) int packet_need_rekeying(void); -#ifdef NONE_CIPHER_ENABLED -void packet_request_rekeying(void); -#endif void packet_set_rekey_limits(u_int32_t, time_t); time_t packet_get_rekey_timeout(void); Modified: user/ngie/more-tests2/crypto/openssh/pathnames.h ============================================================================== --- user/ngie/more-tests2/crypto/openssh/pathnames.h Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/pathnames.h Tue Nov 24 05:12:40 2015 (r291236) @@ -1,5 +1,4 @@ /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen @@ -122,7 +121,7 @@ * Default location of askpass */ #ifndef _PATH_SSH_ASKPASS_DEFAULT -#define _PATH_SSH_ASKPASS_DEFAULT "/usr/local/bin/ssh-askpass" +#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" #endif /* Location of ssh-keysign for hostbased authentication */ @@ -137,7 +136,7 @@ /* xauth for X11 forwarding */ #ifndef _PATH_XAUTH -#define _PATH_XAUTH "/usr/local/bin/xauth" +#define _PATH_XAUTH "/usr/X11R6/bin/xauth" #endif /* UNIX domain socket for X11 server; displaynum will replace %u */ Modified: user/ngie/more-tests2/crypto/openssh/readconf.c ============================================================================== --- user/ngie/more-tests2/crypto/openssh/readconf.c Tue Nov 24 04:19:55 2015 (r291235) +++ user/ngie/more-tests2/crypto/openssh/readconf.c Tue Nov 24 05:12:40 2015 (r291236) @@ -154,9 +154,6 @@ typedef enum { oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, oIgnoredUnknownOption, oHPNDisabled, oHPNBufferSize, oTcpRcvBufPoll, oTcpRcvBuf, -#ifdef NONE_CIPHER_ENABLED - oNoneEnabled, oNoneSwitch, -#endif oVersionAddendum, oDeprecated, oUnsupported } OpCodes; @@ -274,10 +271,6 @@ static struct { { "hpnbuffersize", oHPNBufferSize }, { "tcprcvbufpoll", oTcpRcvBufPoll }, { "tcprcvbuf", oTcpRcvBuf }, -#ifdef NONE_CIPHER_ENABLED - { "noneenabled", oNoneEnabled }, - { "noneswitch", oNoneSwitch }, -#endif { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } @@ -1375,31 +1368,6 @@ parse_int: intptr = &options->tcp_rcv_buf; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Tue Nov 24 07:55:58 2015 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 8386BA3584C for ; Tue, 24 Nov 2015 07:55:58 +0000 (UTC) (envelope-from ngie@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 4CEC81CF6; Tue, 24 Nov 2015 07:55:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO7tvSI008816; Tue, 24 Nov 2015 07:55:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO7ttdg008801; Tue, 24 Nov 2015 07:55:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511240755.tAO7ttdg008801@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 07:55:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291237 - user/ngie/more-tests2/sbin/geom/core/tests/Ref 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.20 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, 24 Nov 2015 07:55:58 -0000 Author: ngie Date: Tue Nov 24 07:55:55 2015 New Revision: 291237 URL: https://svnweb.freebsd.org/changeset/base/291237 Log: - Account for stripesize/stripeoffset in diskinfo output - Remove c partitions from output (/dev/md32c was an alias for /dev/md32 that was deprecated in 8.x) Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha.da0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,7 +1,6 @@ $FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 251658240 491520 -/dev/md34b 512 1086291968 2121664 -/dev/md34c 512 18309995520 35761710 -/dev/md34e 512 20971520 40960 -/dev/md34f 512 16951073792 33107566 +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 251658240 491520 0 0 +/dev/md34b 512 1086291968 2121664 0 0 +/dev/md34e 512 20971520 40960 0 0 +/dev/md34f 512 16951073792 33107566 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,5 +1,4 @@ $FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 24675840 48195 -/dev/md34b 512 4178442240 8161020 -/dev/md34c 512 74027520 144585 +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 24675840 48195 0 0 +/dev/md34b 512 4178442240 8161020 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.apple.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,5 +1,5 @@ $FreeBSD$ -/dev/md34 512 366530560 715880 -/dev/md34s1 512 366481408 715784 -/dev/md34s2 512 32256 63 -/dev/md34s3 512 16384 32 +/dev/md34 512 366530560 715880 0 0 +/dev/md34s1 512 366481408 715784 0 0 +/dev/md34s2 512 32256 63 0 0 +/dev/md34s3 512 16384 32 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.beast.da0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,5 +1,4 @@ $FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 4064280576 7938048 -/dev/md34b 512 270925824 529152 -/dev/md34c 512 4335206400 8467200 +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 4064280576 7938048 0 0 +/dev/md34b 512 270925824 529152 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.critter.ad0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,11 +1,10 @@ $FreeBSD$ -/dev/md34 512 2671841280 5218440 -/dev/md34s1 512 20003848704 39070017 -/dev/md34s1a 512 1073741824 2097152 -/dev/md34s1b 512 1073741824 2097152 -/dev/md34s1c 512 20003848704 39070017 -/dev/md34s1d 512 4447175168 8685889 -/dev/md34s1e 512 524288000 1024000 -/dev/md34s1f 512 4294967296 8388608 -/dev/md34s1g 512 3221225472 6291456 -/dev/md34s1h 512 5368709120 10485760 +/dev/md34 512 2671841280 5218440 0 0 +/dev/md34s1 512 20003848704 39070017 0 0 +/dev/md34s1a 512 1073741824 2097152 0 0 +/dev/md34s1b 512 1073741824 2097152 0 0 +/dev/md34s1d 512 4447175168 8685889 0 0 +/dev/md34s1e 512 524288000 1024000 0 0 +/dev/md34s1f 512 4294967296 8388608 0 0 +/dev/md34s1g 512 3221225472 6291456 0 0 +/dev/md34s1h 512 5368709120 10485760 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.empty.flp.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,2 +1,2 @@ $FreeBSD$ -/dev/md34 512 1474560 2880 80 2 18 +/dev/md34 512 1474560 2880 0 0 80 2 18 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.far.ad0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,4 +1,4 @@ $FreeBSD$ -/dev/md34 512 5632 11 -/dev/md34s1 512 296821760 579730 -/dev/md34s2 512 4564740096 8915508 +/dev/md34 512 5632 11 0 0 +/dev/md34s1 512 296821760 579730 0 0 +/dev/md34s2 512 4564740096 8915508 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.flat.da1.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,12 +1,10 @@ $FreeBSD$ -/dev/md34 512 37888 74 -/dev/md34a 512 37748736 73728 -/dev/md34b 512 268435456 524288 -/dev/md34c 512 8422686720 16450560 -/dev/md34h 512 8115978240 15851520 -/dev/md34s1 512 18367017984 35873082 -/dev/md34s1b 512 419430400 819200 -/dev/md34s1c 512 18367017984 35873082 -/dev/md34s1e 512 419430400 819200 -/dev/md34s1f 512 1073741824 2097152 -/dev/md34s1g 512 16454415360 32137530 +/dev/md34 512 37888 74 0 0 +/dev/md34a 512 37748736 73728 0 0 +/dev/md34b 512 268435456 524288 0 0 +/dev/md34h 512 8115978240 15851520 0 0 +/dev/md34s1 512 18367017984 35873082 0 0 +/dev/md34s1b 512 419430400 819200 0 0 +/dev/md34s1e 512 419430400 819200 0 0 +/dev/md34s1f 512 1073741824 2097152 0 0 +/dev/md34s1g 512 16454415360 32137530 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.kern.flp.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,5 +1,4 @@ $FreeBSD$ -/dev/md34 512 5632 11 -/dev/md34a 512 1474560 2880 -/dev/md34b 512 1474560 2880 -/dev/md34c 512 1474560 2880 +/dev/md34 512 5632 11 0 0 +/dev/md34a 512 1474560 2880 0 0 +/dev/md34b 512 1474560 2880 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.ext.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,27 +1,27 @@ $FreeBSD$ -/dev/md34 512 2327759360 4546405 -/dev/md34s1 512 2146765824 4192902 -/dev/md34s10 512 8193024 16002 -/dev/md34s11 512 8193024 16002 -/dev/md34s12 512 8193024 16002 -/dev/md34s13 512 8193024 16002 -/dev/md34s14 512 8193024 16002 -/dev/md34s15 512 8193024 16002 -/dev/md34s16 512 8193024 16002 -/dev/md34s17 512 8193024 16002 -/dev/md34s18 512 8193024 16002 -/dev/md34s19 512 8193024 16002 -/dev/md34s2 512 427714560 835380 -/dev/md34s20 512 8193024 16002 -/dev/md34s21 512 8193024 16002 -/dev/md34s22 512 8193024 16002 -/dev/md34s23 512 8193024 16002 -/dev/md34s24 512 8193024 16002 -/dev/md34s25 512 8193024 16002 -/dev/md34s26 512 8193024 16002 -/dev/md34s27 512 8193024 16002 -/dev/md34s5 512 8193024 16002 -/dev/md34s6 512 8193024 16002 -/dev/md34s7 512 8193024 16002 -/dev/md34s8 512 8193024 16002 -/dev/md34s9 512 8193024 16002 +/dev/md34 512 2327759360 4546405 0 0 +/dev/md34s1 512 2146765824 4192902 0 0 +/dev/md34s10 512 8193024 16002 0 0 +/dev/md34s11 512 8193024 16002 0 0 +/dev/md34s12 512 8193024 16002 0 0 +/dev/md34s13 512 8193024 16002 0 0 +/dev/md34s14 512 8193024 16002 0 0 +/dev/md34s15 512 8193024 16002 0 0 +/dev/md34s16 512 8193024 16002 0 0 +/dev/md34s17 512 8193024 16002 0 0 +/dev/md34s18 512 8193024 16002 0 0 +/dev/md34s19 512 8193024 16002 0 0 +/dev/md34s2 512 427714560 835380 0 0 +/dev/md34s20 512 8193024 16002 0 0 +/dev/md34s21 512 8193024 16002 0 0 +/dev/md34s22 512 8193024 16002 0 0 +/dev/md34s23 512 8193024 16002 0 0 +/dev/md34s24 512 8193024 16002 0 0 +/dev/md34s25 512 8193024 16002 0 0 +/dev/md34s26 512 8193024 16002 0 0 +/dev/md34s27 512 8193024 16002 0 0 +/dev/md34s5 512 8193024 16002 0 0 +/dev/md34s6 512 8193024 16002 0 0 +/dev/md34s7 512 8193024 16002 0 0 +/dev/md34s8 512 8193024 16002 0 0 +/dev/md34s9 512 8193024 16002 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.msdos.flp.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,2 +1,2 @@ $FreeBSD$ -/dev/md34 512 5632 11 +/dev/md34 512 5632 11 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,8 +1,7 @@ $FreeBSD$ -/dev/md34 512 75264 147 1 8 17 -/dev/md34s1 512 1626603520 3176960 23360 8 17 -/dev/md34s1a 512 78643200 153600 1129 8 17 -/dev/md34s1b 512 104857600 204800 1505 8 17 -/dev/md34s1c 512 1626603520 3176960 23360 8 17 -/dev/md34s1e 512 52428800 102400 752 8 17 -/dev/md34s1f 512 1390673920 2716160 19971 8 17 +/dev/md34 512 75264 147 0 0 1 8 17 +/dev/md34s1 512 1626603520 3176960 23360 0 0 8 17 +/dev/md34s1a 512 78643200 153600 1129 0 0 8 17 +/dev/md34s1b 512 104857600 204800 1505 0 0 8 17 +/dev/md34s1e 512 52428800 102400 752 0 0 8 17 +/dev/md34s1f 512 1390673920 2716160 19971 0 0 8 17 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,6 +1,5 @@ $FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 1529708544 2987712 -/dev/md34b 512 539320320 1053360 -/dev/md34c 512 36698296320 71676360 -/dev/md34h 512 34629267456 67635288 +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 1529708544 2987712 0 0 +/dev/md34b 512 539320320 1053360 0 0 +/dev/md34h 512 34629267456 67635288 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.sun.da1.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,9 +1,8 @@ $FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 262967296 513608 -/dev/md34b 512 1075994624 2101552 -/dev/md34c 512 18108555264 35368272 -/dev/md34d 512 11124240384 21727032 -/dev/md34f 512 2149576704 4198392 -/dev/md34g 512 2149576704 4198392 -/dev/md34h 512 1343787008 2624584 +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 262967296 513608 0 0 +/dev/md34b 512 1075994624 2101552 0 0 +/dev/md34d 512 11124240384 21727032 0 0 +/dev/md34f 512 2149576704 4198392 0 0 +/dev/md34g 512 2149576704 4198392 0 0 +/dev/md34h 512 1343787008 2624584 0 0 Modified: user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml Tue Nov 24 05:12:40 2015 (r291236) +++ user/ngie/more-tests2/sbin/geom/core/tests/Ref/disk.typo.ad0.xml Tue Nov 24 07:55:55 2015 (r291237) @@ -1,14 +1,11 @@ $FreeBSD$ -/dev/md34 512 8585262592 16768091 -/dev/md34s1 512 3220406784 6289857 -/dev/md34s1a 512 104857600 204800 -/dev/md34s1b 512 524288000 1024000 -/dev/md34s1c 512 3220406784 6289857 -/dev/md34s1e 512 524288000 1024000 -/dev/md34s1f 512 2066973184 4037057 -/dev/md34s2 512 5364817920 10478160 -/dev/md34s2c 512 5364817920 10478160 -/dev/md34s3 512 8585256960 16768080 -/dev/md34s3a 512 2097152000 4096000 -/dev/md34s3c 512 8585256960 16768080 -/dev/md34s3d 512 6488104960 12672080 +/dev/md34 512 8585262592 16768091 0 0 +/dev/md34s1 512 3220406784 6289857 0 0 +/dev/md34s1a 512 104857600 204800 0 0 +/dev/md34s1b 512 524288000 1024000 0 0 +/dev/md34s1e 512 524288000 1024000 0 0 +/dev/md34s1f 512 2066973184 4037057 0 0 +/dev/md34s2 512 5364817920 10478160 0 0 +/dev/md34s3 512 8585256960 16768080 0 0 +/dev/md34s3a 512 2097152000 4096000 0 0 +/dev/md34s3d 512 6488104960 12672080 0 0 From owner-svn-src-user@freebsd.org Tue Nov 24 09:05:30 2015 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 27BFEA36BB2 for ; Tue, 24 Nov 2015 09:05:30 +0000 (UTC) (envelope-from ngie@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 C4DC3100C; Tue, 24 Nov 2015 09:05:29 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO95So5029278; Tue, 24 Nov 2015 09:05:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO95SGt029277; Tue, 24 Nov 2015 09:05:28 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511240905.tAO95SGt029277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 09:05:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291240 - user/ngie/more-tests2/sbin/geom/core/tests/MdLoad 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.20 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, 24 Nov 2015 09:05:30 -0000 Author: ngie Date: Tue Nov 24 09:05:28 2015 New Revision: 291240 URL: https://svnweb.freebsd.org/changeset/base/291240 Log: Catch relevant errors Modified: user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c Modified: user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c Tue Nov 24 08:41:27 2015 (r291239) +++ user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c Tue Nov 24 09:05:28 2015 (r291240) @@ -35,22 +35,23 @@ * $FreeBSD$ */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include -#include -#include -#include -#include -#include + #include -#include -#include -#include -#include -#include struct sector { LIST_ENTRY(sector) sectors; @@ -216,9 +217,12 @@ g_simdisk_xml_load(const char *file) fd = open(file, O_RDONLY); if (fd < 0) - err(1, "%s", file); - fstat(fd, &st); + err(1, "%s: opening %s failed", __func__, file); + if (fstat(fd, &st) == -1) + err(1, "%s: fstat'ing %s failed", __func__, file); p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); + if (p == MAP_FAILED) + err(1, "%s: mmap'ing %s failed", __func__, file); i = XML_Parse(parser, p, st.st_size, 1); if (i != 1) errx(1, "XML_Parse complains: return %d", i); @@ -252,7 +256,7 @@ main(int argc, char **argv) sprintf(buf + strlen(buf), " -u %s", argv[1]); error = system(buf); if (error) - return (error); + err(1, "calling `%s` failed; status=%d", buf, error); fd = open(argv[1], O_RDWR); if (fd < 0 && errno == ENOENT) { sprintf(buf, "%s%s", _PATH_DEV, argv[1]); From owner-svn-src-user@freebsd.org Tue Nov 24 09:08:33 2015 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 6E0E9A36C5A for ; Tue, 24 Nov 2015 09:08:33 +0000 (UTC) (envelope-from ngie@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 1BDA01192; Tue, 24 Nov 2015 09:08:33 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO98W71029413; Tue, 24 Nov 2015 09:08:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO98WTf029412; Tue, 24 Nov 2015 09:08:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511240908.tAO98WTf029412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 09:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291241 - user/ngie/more-tests2/sbin/geom/core/tests 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.20 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, 24 Nov 2015 09:08:33 -0000 Author: ngie Date: Tue Nov 24 09:08:31 2015 New Revision: 291241 URL: https://svnweb.freebsd.org/changeset/base/291241 Log: Do some incremental work trying to improve the test script Unfortunately it seems that phk broke how labels/partitions were created in r113434 and the gap was never completed, so these testcases are broken. Exit early Modified: user/ngie/more-tests2/sbin/geom/core/tests/run_test.sh Modified: user/ngie/more-tests2/sbin/geom/core/tests/run_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/core/tests/run_test.sh Tue Nov 24 09:05:28 2015 (r291240) +++ user/ngie/more-tests2/sbin/geom/core/tests/run_test.sh Tue Nov 24 09:08:31 2015 (r291241) @@ -2,49 +2,60 @@ # $FreeBSD$ MD=34 -TMP=/tmp/$$ +: ${TMPDIR=/tmp} +TMP=$TMPDIR/$$ + +# The testcases seem to have been broken when the geom_sim provider was removed +echo "# these tests need to be rewritten; they were broken in r113434" +echo "1..0 # SKIP" +exit 0 set -e # Start from the right directory so we can find all our data files. -cd `dirname $0` - -(cd MdLoad && make) > /dev/null 2>&1 +testsdir=$(realpath $(dirname $0)) # Print the test header -echo -n '1..' -echo `ls -1 Data/disk.*.xml | wc -l` +set -- $testsdir/Data/disk.*.xml +echo "1..$#" +data_files="$@" + +trap "rm -f $TMP; mdconfig -d -u $MD" EXIT INT TERM -for f in Data/disk.*.xml -do +set +e + +refdir=$(realpath $(mktemp -d Ref.XXXXXX)) +for f in $data_files; do b=`basename $f` - mdconfig -d -u $MD > /dev/null 2>&1 || true - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then + mdconfig -d -u $MD + + i=0 + while [ $i -lt 2 -a -c /dev/md$MD ]; do sleep 1 - fi + : $(( i += 1 )) + done if [ -c /dev/md$MD ] ; then echo "Bail out!" echo "/dev/md$MD is busy" exit 1 fi - MdLoad/MdLoad md${MD} $f - if [ -f Ref/$b ] ; then - if diskinfo /dev/md${MD}* | - diff -I '$FreeBSD' -u Ref/$b - > $TMP; then - echo "ok - $b" + if ! $testsdir/MdLoad/MdLoad md${MD} $f; then + echo "not ok - $b # MdLoad failed" + continue + fi + if [ ! -f $refdir/$b ]; then + if [ -f $testsdir/Ref/$b ] ; then + grep -v '\$FreeBSD.*\$' $testsdir/Ref/$b > $refdir/$b else - echo "not ok - $b" - sed 's/^/# /' $TMP + diskinfo /dev/md${MD}* > $refdir/$b + continue fi + fi + diskinfo /dev/md${MD}* | diff -u $refdir/$b - > $TMP + if [ $? -eq 0 ]; then + echo "ok - $b" else - diskinfo /dev/md${MD}* > Ref/`basename $f` + echo "not ok - $b" + sed 's/^/# /' $TMP fi done - -mdconfig -d -u $MD > /dev/null 2>&1 || true -rm -f $TMP - -exit 0 From owner-svn-src-user@freebsd.org Tue Nov 24 09:52:47 2015 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 727D5A359DB for ; Tue, 24 Nov 2015 09:52:47 +0000 (UTC) (envelope-from ngie@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 3CC7C10A1; Tue, 24 Nov 2015 09:52:47 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO9qkr1043863; Tue, 24 Nov 2015 09:52:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO9qk3Y043862; Tue, 24 Nov 2015 09:52:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511240952.tAO9qk3Y043862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 09:52:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291245 - user/ngie/more-tests2/sbin/geom/class/tests/eli 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.20 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, 24 Nov 2015 09:52:47 -0000 Author: ngie Date: Tue Nov 24 09:52:46 2015 New Revision: 291245 URL: https://svnweb.freebsd.org/changeset/base/291245 Log: Increase the timeout for onetime_test and onetime_a_test to 10 minutes Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Tue Nov 24 09:45:36 2015 (r291244) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Tue Nov 24 09:52:46 2015 (r291245) @@ -26,7 +26,7 @@ TEST_METADATA.init_test+= timeout="300" TEST_METADATA.integrity_copy_test+= timeout="1200" TEST_METADATA.integrity_data_test+= timeout="600" TEST_METADATA.integrity_hmac_test+= timeout="600" -TEST_METADATA.onetime_test+= timeout="300" -TEST_METADATA.onetime_a_test+= timeout="300" +TEST_METADATA.onetime_a_test+= timeout="600" +TEST_METADATA.onetime_test+= timeout="600" .include From owner-svn-src-user@freebsd.org Tue Nov 24 23:44:08 2015 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 59C6DA37F48 for ; Tue, 24 Nov 2015 23:44:08 +0000 (UTC) (envelope-from ngie@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 243E91139; Tue, 24 Nov 2015 23:44:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAONi7iQ054822; Tue, 24 Nov 2015 23:44:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAONi7lb054821; Tue, 24 Nov 2015 23:44:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511242344.tAONi7lb054821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 23:44:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291269 - user/ngie/more-tests2/sbin/ggate/ggated 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.20 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, 24 Nov 2015 23:44:08 -0000 Author: ngie Date: Tue Nov 24 23:44:06 2015 New Revision: 291269 URL: https://svnweb.freebsd.org/changeset/base/291269 Log: Add -F pidfile to usage(..) Modified: user/ngie/more-tests2/sbin/ggate/ggated/ggated.c Modified: user/ngie/more-tests2/sbin/ggate/ggated/ggated.c ============================================================================== --- user/ngie/more-tests2/sbin/ggate/ggated/ggated.c Tue Nov 24 23:04:03 2015 (r291268) +++ user/ngie/more-tests2/sbin/ggate/ggated/ggated.c Tue Nov 24 23:44:06 2015 (r291269) @@ -112,8 +112,8 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-nv] [-a address] [-p port] [-R rcvbuf] " - "[-S sndbuf] [exports file]\n", getprogname()); + fprintf(stderr, "usage: %s [-nv] [-a address] [-F pidfile] [-p port] " + "[-R rcvbuf] [-S sndbuf] [exports file]\n", getprogname()); exit(EXIT_FAILURE); } From owner-svn-src-user@freebsd.org Tue Nov 24 23:45:39 2015 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 78ABCA37F65 for ; Tue, 24 Nov 2015 23:45:39 +0000 (UTC) (envelope-from ngie@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 4768E124D; Tue, 24 Nov 2015 23:45:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAONjcOR054915; Tue, 24 Nov 2015 23:45:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAONjcW3054914; Tue, 24 Nov 2015 23:45:38 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511242345.tAONjcW3054914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 24 Nov 2015 23:45:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291270 - user/ngie/more-tests2/sbin/geom/class/tests/gate 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.20 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, 24 Nov 2015 23:45:39 -0000 Author: ngie Date: Tue Nov 24 23:45:38 2015 New Revision: 291270 URL: https://svnweb.freebsd.org/changeset/base/291270 Log: Load geom_gate.ko via kldload as `[geom ]gate load` isn't implemented. Every time geom_subr.sh tries to run the command, it'll fail Modified: user/ngie/more-tests2/sbin/geom/class/tests/gate/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/gate/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/gate/conf.sh Tue Nov 24 23:44:06 2015 (r291269) +++ user/ngie/more-tests2/sbin/geom/class/tests/gate/conf.sh Tue Nov 24 23:45:38 2015 (r291270) @@ -5,4 +5,6 @@ name="$(mktemp -u gate.XXXXXX)" class="gate" base=`basename $0` +kldstat -q -m g_${class} || kldload geom_${class} || exit 1 + . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 00:12:16 2015 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 499CCA36607 for ; Wed, 25 Nov 2015 00:12:16 +0000 (UTC) (envelope-from ngie@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 138311EE0; Wed, 25 Nov 2015 00:12:16 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP0CFhA063371; Wed, 25 Nov 2015 00:12:15 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP0CEet063359; Wed, 25 Nov 2015 00:12:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250012.tAP0CEet063359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 00:12:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291271 - user/ngie/more-tests2/sbin/geom/class/tests/raid3 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.20 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: Wed, 25 Nov 2015 00:12:16 -0000 Author: ngie Date: Wed Nov 25 00:12:13 2015 New Revision: 291271 URL: https://svnweb.freebsd.org/changeset/base/291271 Log: - Allocate random devices via attach_md - Replace hardcoded references to /tmp with $TMPDIR - Remove all manual mdconfig -d -u calls Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label -r $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label -r $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label -w $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label -w $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,31 +5,28 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` nblocks1=9 nblocks2=`expr $nblocks1 - 1` nblocks3=`expr $nblocks2 / 2` -mdconfig -a -t malloc -s $nblocks1 -u $us0 || exit 1 -mdconfig -a -t malloc -s $nblocks1 -u $us1 || exit 1 -mdconfig -a -t malloc -s $nblocks1 -u $us2 || exit 1 - -dd if=/dev/random of=/dev/md${us0} count=$nblocks1 >/dev/null 2>&1 -dd if=/dev/random of=/dev/md${us1} count=$nblocks1 >/dev/null 2>&1 -dd if=/dev/random of=/dev/md${us2} count=$nblocks1 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $nblocks1) || exit 1 +us1=$(attach_md -t malloc -s $nblocks1) || exit 1 +us2=$(attach_md -t malloc -s $nblocks1) || exit 1 + +dd if=/dev/random of=/dev/${us0} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/random of=/dev/${us1} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/random of=/dev/${us2} count=$nblocks1 >/dev/null 2>&1 -graid3 label -w $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label -w $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # Wait for synchronization. sleep 2 graid3 stop $name # Break one component. -dd if=/dev/random of=/dev/md${us1} count=$nblocks2 >/dev/null 2>&1 +dd if=/dev/random of=/dev/${us1} count=$nblocks2 >/dev/null 2>&1 # Provoke retaste of the rest components. -true > /dev/md${us0} -true > /dev/md${us2} +true > /dev/${us0} +true > /dev/${us2} sleep 1 dd if=/dev/raid3/${name} of=/dev/null bs=1k count=$nblocks3 >/dev/null 2>&1 @@ -41,6 +38,3 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,15 +5,11 @@ echo "1..2" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` - -mdconfig -a -t malloc -s 1M -u $us0 || exit 1 -mdconfig -a -t malloc -s 2M -u $us1 || exit 1 -mdconfig -a -t malloc -s 3M -u $us2 || exit 1 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} 2>/dev/null || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} 2>/dev/null || exit 1 devwait # Size of created device should be 2MB - 1024B. @@ -32,6 +28,3 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -37,7 +34,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # @@ -37,7 +34,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # @@ -37,7 +34,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -29,7 +26,7 @@ dd if=${src} of=/dev/raid3/${name} bs=$d # Rebuild of DATA component. # graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 graid3 insert -n 1 $name md${us1} sleep 1 @@ -41,7 +38,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -29,12 +26,12 @@ dd if=${src} of=/dev/raid3/${name} bs=$d # Rebuild of PARITY component. # graid3 remove -n 2 $name -dd if=/dev/zero of=/dev/md${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 graid3 insert -n 2 $name md${us2} sleep 1 # Remove DATA component, so PARITY component can be used while reading. graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then @@ -44,7 +41,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,29 +5,26 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # # Writing without DATA component and rebuild of DATA component. # graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 graid3 insert -n 1 $name md${us1} sleep 1 @@ -40,7 +37,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Tue Nov 24 23:45:38 2015 (r291270) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Wed Nov 25 00:12:13 2015 (r291271) @@ -5,35 +5,32 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # # Writing without PARITY component and rebuild of PARITY component. # graid3 remove -n 2 $name -dd if=/dev/zero of=/dev/md${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 graid3 insert -n 2 $name md${us2} sleep 1 # Remove DATA component, so PARITY component can be used while reading. graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then @@ -43,7 +40,4 @@ else fi graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} From owner-svn-src-user@freebsd.org Wed Nov 25 00:17:26 2015 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 E84CAA36730 for ; Wed, 25 Nov 2015 00:17:26 +0000 (UTC) (envelope-from ngie@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 9D76811B1; Wed, 25 Nov 2015 00:17:26 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP0HPQS063585; Wed, 25 Nov 2015 00:17:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP0HPVW063584; Wed, 25 Nov 2015 00:17:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250017.tAP0HPVW063584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 00:17:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291272 - user/ngie/more-tests2/sbin/geom/class/tests/raid3 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.20 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: Wed, 25 Nov 2015 00:17:27 -0000 Author: ngie Date: Wed Nov 25 00:17:25 2015 New Revision: 291272 URL: https://svnweb.freebsd.org/changeset/base/291272 Log: Implement graid3_test_cleanup, which calls graid3 stop $name, then geom_test_cleanup Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/conf.sh Wed Nov 25 00:12:13 2015 (r291271) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/conf.sh Wed Nov 25 00:17:25 2015 (r291272) @@ -5,4 +5,11 @@ name="test" class="raid3" base=`basename $0` +graid3_test_cleanup() +{ + [ -c /dev/$class/$name ] && graid3 stop $name + geom_test_cleanup +} +trap graid3_test_cleanup ABRT EXIT INT TERM + . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 00:17:59 2015 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 54E1EA36760 for ; Wed, 25 Nov 2015 00:17:59 +0000 (UTC) (envelope-from ngie@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 F062412B4; Wed, 25 Nov 2015 00:17:58 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP0Hvqh063655; Wed, 25 Nov 2015 00:17:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP0HuR5063643; Wed, 25 Nov 2015 00:17:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250017.tAP0HuR5063643@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 00:17:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291273 - user/ngie/more-tests2/sbin/geom/class/tests/raid3 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.20 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: Wed, 25 Nov 2015 00:17:59 -0000 Author: ngie Date: Wed Nov 25 00:17:56 2015 New Revision: 291273 URL: https://svnweb.freebsd.org/changeset/base/291273 Log: Remove `graid3 stop $name` Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -29,5 +29,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -29,5 +29,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -36,5 +36,3 @@ if [ $ec -eq 0 ]; then else echo "ok 1" fi - -graid3 stop $name Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -26,5 +26,3 @@ if [ $sectorsize -eq 1024 ]; then else echo "not ok 2" fi - -graid3 stop $name Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -29,5 +29,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -33,5 +33,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -33,5 +33,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -33,5 +33,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -37,5 +37,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -40,5 +40,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -36,5 +36,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Wed Nov 25 00:17:25 2015 (r291272) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Wed Nov 25 00:17:56 2015 (r291273) @@ -39,5 +39,4 @@ else echo "ok 1" fi -graid3 stop $name rm -f ${src} ${dst} From owner-svn-src-user@freebsd.org Wed Nov 25 00:33:44 2015 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 6DA1FA36CE8 for ; Wed, 25 Nov 2015 00:33:44 +0000 (UTC) (envelope-from ngie@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 2D9451D0C; Wed, 25 Nov 2015 00:33:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP0XgRD069294; Wed, 25 Nov 2015 00:33:42 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP0XgmX069291; Wed, 25 Nov 2015 00:33:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250033.tAP0XgmX069291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 00:33:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291274 - user/ngie/more-tests2/sbin/geom/class/tests/uzip 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.20 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: Wed, 25 Nov 2015 00:33:44 -0000 Author: ngie Date: Wed Nov 25 00:33:42 2015 New Revision: 291274 URL: https://svnweb.freebsd.org/changeset/base/291274 Log: Move 1 to 1_test and 2 to 2_test Added: user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh - copied unchanged from r291273, user/ngie/more-tests2/sbin/geom/class/tests/uzip/1.sh user/ngie/more-tests2/sbin/geom/class/tests/uzip/2_test.sh - copied unchanged from r291273, user/ngie/more-tests2/sbin/geom/class/tests/uzip/2.sh Deleted: user/ngie/more-tests2/sbin/geom/class/tests/uzip/1.sh user/ngie/more-tests2/sbin/geom/class/tests/uzip/2.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Copied: user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh (from r291273, user/ngie/more-tests2/sbin/geom/class/tests/uzip/1.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh Wed Nov 25 00:33:42 2015 (r291274, copy of r291273, user/ngie/more-tests2/sbin/geom/class/tests/uzip/1.sh) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +mntpoint="/mnt/test-1" + +# +# prepare +kldload geom_uzip +UUE=$(dirname $0)/1.img.uzip.uue +uudecode $UUE +num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1 +sleep 1 + +# +# mount +mkdir -p "${mntpoint}" +mount -o ro /dev/md${num}.uzip "${mntpoint}" || exit 1 + +# +# compare +#cat "${mntpoint}/etalon.txt" +diff -u etalon/etalon.txt "${mntpoint}/etalon.txt" +if [ $? -eq 0 ]; then + echo "PASS" +else + echo "FAIL" +fi + +# +# cleanup +umount "${mntpoint}" +rmdir "${mntpoint}" +mdconfig -d -u ${num} +sleep 1 +kldunload geom_uzip Copied: user/ngie/more-tests2/sbin/geom/class/tests/uzip/2_test.sh (from r291273, user/ngie/more-tests2/sbin/geom/class/tests/uzip/2.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/2_test.sh Wed Nov 25 00:33:42 2015 (r291274, copy of r291273, user/ngie/more-tests2/sbin/geom/class/tests/uzip/2.sh) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# +# prepare + +UUE=$(dirname $0)/1.img.uzip.uue + +kldload geom_uzip +uudecode $UUE +num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1 +sleep 1 + +# +# destroy +kldunload geom_uzip Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 00:17:56 2015 (r291273) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 00:33:42 2015 (r291274) @@ -28,7 +28,7 @@ FILESGROUPS= FILES etalon etalon+= etalon/etalon.txt etalonDIR= ${TESTSDIR}/etalon -PLAIN_TESTS_SH+= 1 -PLAIN_TESTS_SH+= 2 +PLAIN_TESTS_SH+= 1_test +PLAIN_TESTS_SH+= 2_test .include From owner-svn-src-user@freebsd.org Wed Nov 25 00:52:12 2015 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 3DA03A3706C for ; Wed, 25 Nov 2015 00:52:12 +0000 (UTC) (envelope-from ngie@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 0AB351397; Wed, 25 Nov 2015 00:52:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP0qBuX074296; Wed, 25 Nov 2015 00:52:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP0qBk0074295; Wed, 25 Nov 2015 00:52:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250052.tAP0qBk0074295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 00:52:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291275 - user/ngie/more-tests2/sbin/geom/class/tests/uzip 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.20 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: Wed, 25 Nov 2015 00:52:12 -0000 Author: ngie Date: Wed Nov 25 00:52:10 2015 New Revision: 291275 URL: https://svnweb.freebsd.org/changeset/base/291275 Log: Remove useless test Deleted: user/ngie/more-tests2/sbin/geom/class/tests/uzip/2_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 00:33:42 2015 (r291274) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 00:52:10 2015 (r291275) @@ -29,6 +29,5 @@ etalon+= etalon/etalon.txt etalonDIR= ${TESTSDIR}/etalon PLAIN_TESTS_SH+= 1_test -PLAIN_TESTS_SH+= 2_test .include From owner-svn-src-user@freebsd.org Wed Nov 25 01:14:02 2015 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 43122A37357 for ; Wed, 25 Nov 2015 01:14:02 +0000 (UTC) (envelope-from ngie@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 08EEF1CC2; Wed, 25 Nov 2015 01:14:01 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP1E1fJ080821; Wed, 25 Nov 2015 01:14:01 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP1E15A080820; Wed, 25 Nov 2015 01:14:01 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250114.tAP1E15A080820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 01:14:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291276 - user/ngie/more-tests2/sbin/geom/class/tests/uzip 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.20 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: Wed, 25 Nov 2015 01:14:02 -0000 Author: ngie Date: Wed Nov 25 01:14:00 2015 New Revision: 291276 URL: https://svnweb.freebsd.org/changeset/base/291276 Log: Add conf.sh for creating a mountpoint, unmounting the mountpoint and cleaning up any temporary md devices Added: user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh - copied, changed from r291237, user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh Copied and modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh (from r291237, user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh) ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh Tue Nov 24 07:55:55 2015 (r291237, copy source) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Wed Nov 25 01:14:00 2015 (r291276) @@ -1,15 +1,16 @@ #!/bin/sh # $FreeBSD$ -name="$(mktemp -u mirror.XXXXXX)" -class="mirror" +class="uzip" base=`basename $0` +mntpoint=$(mktemp -d $TMPDIR/tmp.XXXXXX) || exit -gmirror_test_cleanup() +uzip_test_cleanup() { - [ -c /dev/$class/$name ] && gmirror destroy $name + umount $mntpoint + rmdir $mntpoint geom_test_cleanup } -trap gmirror_test_cleanup ABRT EXIT INT TERM +trap uzip_test_cleanup ABRT EXIT INT TERM . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 01:15:27 2015 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 85BA8A37371 for ; Wed, 25 Nov 2015 01:15:27 +0000 (UTC) (envelope-from ngie@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 364B21DE4; Wed, 25 Nov 2015 01:15:27 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP1FQCa080912; Wed, 25 Nov 2015 01:15:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP1FQLB080910; Wed, 25 Nov 2015 01:15:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250115.tAP1FQLB080910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 01:15:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291277 - user/ngie/more-tests2/sbin/geom/class/tests/uzip 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.20 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: Wed, 25 Nov 2015 01:15:27 -0000 Author: ngie Date: Wed Nov 25 01:15:25 2015 New Revision: 291277 URL: https://svnweb.freebsd.org/changeset/base/291277 Log: - Convert 1_test into a TAP testcase - Use conf.sh - Simplify the setup/cleanup steps Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh Wed Nov 25 01:14:00 2015 (r291276) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/1_test.sh Wed Nov 25 01:15:25 2015 (r291277) @@ -1,37 +1,22 @@ #!/bin/sh -# # $FreeBSD$ -# -mntpoint="/mnt/test-1" +testsdir=$(dirname $0) +. $testsdir/conf.sh -# -# prepare -kldload geom_uzip -UUE=$(dirname $0)/1.img.uzip.uue +echo "1..1" + +UUE=$testsdir/1.img.uzip.uue uudecode $UUE -num=`mdconfig -an -f $(basename $UUE .uue)` || exit 1 +us0=$(attach_md -f $(basename $UUE .uue)) || exit 1 sleep 1 -# -# mount -mkdir -p "${mntpoint}" -mount -o ro /dev/md${num}.uzip "${mntpoint}" || exit 1 +mount -o ro /dev/${us0}.uzip "${mntpoint}" || exit 1 -# -# compare #cat "${mntpoint}/etalon.txt" -diff -u etalon/etalon.txt "${mntpoint}/etalon.txt" +diff -I '\$FreeBSD.*\$' -u $testsdir/etalon/etalon.txt "${mntpoint}/etalon.txt" if [ $? -eq 0 ]; then - echo "PASS" + echo "ok 1" else - echo "FAIL" + echo "not ok 1" fi - -# -# cleanup -umount "${mntpoint}" -rmdir "${mntpoint}" -mdconfig -d -u ${num} -sleep 1 -kldunload geom_uzip Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 01:14:00 2015 (r291276) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/Makefile Wed Nov 25 01:15:25 2015 (r291277) @@ -21,6 +21,9 @@ ${UZIMAGE}: ${IMAGE} ${ZIMAGE} printf "FreeBSD$$\n#\n\n" >> ${.TARGET} uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET} +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh + FILES+= ${UZIMAGE} FILESDIR= ${TESTSDIR} @@ -28,6 +31,6 @@ FILESGROUPS= FILES etalon etalon+= etalon/etalon.txt etalonDIR= ${TESTSDIR}/etalon -PLAIN_TESTS_SH+= 1_test +TAP_TESTS_SH+= 1_test .include From owner-svn-src-user@freebsd.org Wed Nov 25 01:27:52 2015 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 F231BA374B5 for ; Wed, 25 Nov 2015 01:27:52 +0000 (UTC) (envelope-from ngie@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 BCDF811C6; Wed, 25 Nov 2015 01:27:52 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP1RpB3083881; Wed, 25 Nov 2015 01:27:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP1RprW083880; Wed, 25 Nov 2015 01:27:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250127.tAP1RprW083880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 01:27:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291278 - user/ngie/more-tests2/sbin/geom/class/tests/stripe 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.20 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: Wed, 25 Nov 2015 01:27:53 -0000 Author: ngie Date: Wed Nov 25 01:27:51 2015 New Revision: 291278 URL: https://svnweb.freebsd.org/changeset/base/291278 Log: - Implement gstripe_test_cleanup - Use a random name for the gstripe Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/stripe/conf.sh Wed Nov 25 01:15:25 2015 (r291277) +++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/conf.sh Wed Nov 25 01:27:51 2015 (r291278) @@ -1,8 +1,15 @@ #!/bin/sh # $FreeBSD$ -name="test" +name="$(mktemp -u stripe.XXXXXX)" class="stripe" base=`basename $0` +gstripe_test_cleanup() +{ + [ -c /dev/$class/$name ] && gstripe destroy $name + geom_test_cleanup +} +trap gstripe_test_cleanup ABRT EXIT INT TERM + . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 01:29:48 2015 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 EEA59A374CE for ; Wed, 25 Nov 2015 01:29:47 +0000 (UTC) (envelope-from ngie@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 ACBC512D8; Wed, 25 Nov 2015 01:29:47 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP1Tk2A083986; Wed, 25 Nov 2015 01:29:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP1TkLQ083984; Wed, 25 Nov 2015 01:29:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250129.tAP1TkLQ083984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 01:29:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291279 - user/ngie/more-tests2/sbin/geom/class/tests/stripe 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.20 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: Wed, 25 Nov 2015 01:29:48 -0000 Author: ngie Date: Wed Nov 25 01:29:46 2015 New Revision: 291279 URL: https://svnweb.freebsd.org/changeset/base/291279 Log: - Attach md devices with attach_md - Remove unnecessary mdconfig -d -u and gstripe destroy calls at the end of the scripts Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh Wed Nov 25 01:27:51 2015 (r291278) +++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh Wed Nov 25 01:29:46 2015 (r291279) @@ -5,13 +5,11 @@ echo "1..1" -us=45 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gstripe create -s 16384 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gstripe create -s 16384 $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait # Size of created device should be 1MB * 3. @@ -23,8 +21,3 @@ if [ $size -eq 3145728 ]; then else echo "not ok 1" fi - -gstripe destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Wed Nov 25 01:27:51 2015 (r291278) +++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Wed Nov 25 01:29:46 2015 (r291279) @@ -5,18 +5,17 @@ echo "1..1" -us=45 tsize=3 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -gstripe create -s 8192 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gstripe create -s 8192 $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait dd if=${src} of=/dev/stripe/${name} bs=1m count=$tsize >/dev/null 2>&1 @@ -28,8 +27,4 @@ else echo "ok 1" fi -gstripe destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` rm -f ${src} ${dst} From owner-svn-src-user@freebsd.org Wed Nov 25 02:24:10 2015 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 021D0A37EF5 for ; Wed, 25 Nov 2015 02:24:09 +0000 (UTC) (envelope-from ngie@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 C1D311F7F; Wed, 25 Nov 2015 02:24:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP2O87i001607; Wed, 25 Nov 2015 02:24:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP2O8LI001604; Wed, 25 Nov 2015 02:24:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250224.tAP2O8LI001604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 02:24:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291281 - user/ngie/more-tests2/sbin/geom/class/tests/shsec 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.20 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: Wed, 25 Nov 2015 02:24:10 -0000 Author: ngie Date: Wed Nov 25 02:24:08 2015 New Revision: 291281 URL: https://svnweb.freebsd.org/changeset/base/291281 Log: conf.sh: - Implement gshsec_test_cleanup - Use a random name for the shsec 1_test.sh/2_test.sh: - Attach md devices with attach_md - Remove unnecessary mdconfig -d -u and gstripe destroy calls at the end of the scripts Modified: user/ngie/more-tests2/sbin/geom/class/tests/shsec/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/shsec/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/shsec/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/shsec/1_test.sh Wed Nov 25 01:59:08 2015 (r291280) +++ user/ngie/more-tests2/sbin/geom/class/tests/shsec/1_test.sh Wed Nov 25 02:24:08 2015 (r291281) @@ -5,15 +5,11 @@ echo "1..2" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us0 || exit 1 -mdconfig -a -t malloc -s 2M -u $us1 || exit 1 -mdconfig -a -t malloc -s 3M -u $us2 || exit 1 - -gshsec label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} 2>/dev/null || exit 1 +gshsec label $name /dev/${us0} /dev/${us1} /dev/${us2} 2>/dev/null || exit 1 devwait # Size of created device should be 1MB - 512B. @@ -30,8 +26,3 @@ if [ $sectorsize -eq 512 ]; then else echo "not ok 2" fi - -gshsec stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 Modified: user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh Wed Nov 25 01:59:08 2015 (r291280) +++ user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh Wed Nov 25 02:24:08 2015 (r291281) @@ -5,21 +5,18 @@ echo "1..4" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` nblocks1=1024 nblocks2=`expr $nblocks1 + 1` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 dd if=/dev/random of=${src} count=$nblocks1 >/dev/null 2>&1 -mdconfig -a -t malloc -s $nblocks2 -u $us0 || exit 1 -mdconfig -a -t malloc -s $nblocks2 -u $us1 || exit 1 -mdconfig -a -t malloc -s $nblocks2 -u $us2 || exit 1 +us0=$(attach_md -t malloc -s $nblocks2) || exit 1 +us1=$(attach_md -t malloc -s $nblocks2) || exit 1 +us2=$(attach_md -t malloc -s $nblocks2) || exit 1 -gshsec label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gshsec label $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait dd if=${src} of=/dev/shsec/${name} count=$nblocks1 >/dev/null 2>&1 @@ -31,29 +28,25 @@ else echo "ok 1" fi -dd if=/dev/md${us0} of=${dst} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/${us0} of=${dst} count=$nblocks1 >/dev/null 2>&1 if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then echo "not ok 2" else echo "ok 2" fi -dd if=/dev/md${us1} of=${dst} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/${us1} of=${dst} count=$nblocks1 >/dev/null 2>&1 if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then echo "not ok 3" else echo "ok 3" fi -dd if=/dev/md${us2} of=${dst} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/${us2} of=${dst} count=$nblocks1 >/dev/null 2>&1 if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then echo "not ok 4" else echo "ok 4" fi -gshsec stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/shsec/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/shsec/conf.sh Wed Nov 25 01:59:08 2015 (r291280) +++ user/ngie/more-tests2/sbin/geom/class/tests/shsec/conf.sh Wed Nov 25 02:24:08 2015 (r291281) @@ -1,8 +1,15 @@ #!/bin/sh # $FreeBSD$ -name="test" +name="$(mktemp -u shsec.XXXXXX)" class="shsec" base=`basename $0` +shsec_test_cleanup() +{ + [ -c /dev/$class/$name ] && gshsec stop $name + geom_test_cleanup +} +trap shsec_test_cleanup ABRT EXIT INT TERM + . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 03:46:53 2015 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 2B98AA36F0E for ; Wed, 25 Nov 2015 03:46:53 +0000 (UTC) (envelope-from ngie@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 E0A1D13BB; Wed, 25 Nov 2015 03:46:52 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP3kq4d025053; Wed, 25 Nov 2015 03:46:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP3knJU025029; Wed, 25 Nov 2015 03:46:49 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250346.tAP3knJU025029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 03:46:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291282 - user/ngie/more-tests2/sbin/geom/class/tests/eli 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.20 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: Wed, 25 Nov 2015 03:46:53 -0000 Author: ngie Date: Wed Nov 25 03:46:49 2015 New Revision: 291282 URL: https://svnweb.freebsd.org/changeset/base/291282 Log: Probe for the first available md unit number instead of hardcoding 45 Detach/mdconfig -d -u at the end of the test consistently Added: user/ngie/more-tests2/sbin/geom/class/tests/eli/conf.sh - copied, changed from r291237, user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Wed Nov 25 03:46:49 2015 (r291282) @@ -29,4 +29,8 @@ TEST_METADATA.integrity_hmac_test+= time TEST_METADATA.onetime_a_test+= timeout="600" TEST_METADATA.onetime_test+= timeout="600" +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + .include Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -34,5 +35,4 @@ else echo "not ok 3" fi -mdconfig -d -u $no rm -f $keyfile Copied and modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/conf.sh (from r291237, user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh) ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh Tue Nov 24 07:55:55 2015 (r291237, copy source) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/conf.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,15 +1,19 @@ #!/bin/sh # $FreeBSD$ -name="$(mktemp -u mirror.XXXXXX)" -class="mirror" +class="eli" base=`basename $0` -gmirror_test_cleanup() +no=0 +while [ -c /dev/md$no ]; do + : $(( no += 1 )) +done + +geli_test_cleanup() { - [ -c /dev/$class/$name ] && gmirror destroy $name - geom_test_cleanup + [ -c /dev/md${no}.eli ] && geli detach md${no}.eli + mdconfig -d -u $no } -trap gmirror_test_cleanup ABRT EXIT INT TERM +trap geli_test_cleanup ABRT EXIT INT TERM . `dirname $0`/../geom_subr.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -126,5 +127,3 @@ if [ $? -eq 0 ]; then else echo "not ok 17" fi - -mdconfig -d -u $no Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile1=`mktemp $base.XXXXXX` || exit 1 keyfile2=`mktemp $base.XXXXXX` || exit 1 @@ -136,5 +137,4 @@ else echo "not ok 14" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -40,5 +41,4 @@ else echo "not ok 4" fi -mdconfig -d -u $no rm -f $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 backupfile=`mktemp $base.XXXXXX` || exit 1 @@ -99,8 +100,5 @@ if [ -c /dev/md${no}.eli ]; then else echo "not ok 13 - -B file" fi -geli detach md${no} -rm -f $backupfile -mdconfig -d -u $no -rm -f $keyfile +rm -f $backupfile $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile0=`mktemp $base.XXXXXX` || exit 1 keyfile1=`mktemp $base.XXXXXX` || exit 1 @@ -122,5 +123,4 @@ for iter in -1 0 64; do echo "ok ${i}"; i=$((i+1)) done -mdconfig -d -u $no rm -f ${keyfile0} ${keyfile1} ${passfile0} ${passfile1} Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -18,5 +19,4 @@ else echo "not ok 1" fi -mdconfig -d -u $no rm -f $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 sector=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 sector=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 sector=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile1=`mktemp $base.XXXXXX` || exit 1 keyfile2=`mktemp $base.XXXXXX` || exit 1 @@ -93,5 +94,4 @@ else echo "not ok 9" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -61,5 +62,4 @@ else echo "not ok 8" fi -mdconfig -d -u $no rm -f $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 echo "1..1380" Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 mdconfig -a -t malloc -s $sectors -u $no || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 echo "1..460" Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,7 +1,8 @@ -#! /bin/sh -# +#!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + echo 1..27 BLK=512 @@ -22,8 +23,6 @@ setsize() { # Initialise -kldload geom_eli >/dev/null 2>&1 - setsize 10 40 || echo -n "not " echo ok $i - "Sized ${md}a to 10m" i=$((i + 1)) @@ -145,6 +144,5 @@ echo ok $i - "Attached ${md}p1.eli" i=$((i + 1)) geli detach ${md}p1.eli -mdconfig -du$unit rm tmp.* Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 rnd=`mktemp $base.XXXXXX` || exit 1 keyfile1=`mktemp $base.XXXXXX` || exit 1 @@ -152,5 +153,4 @@ else echo "not ok 16" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 $keyfile5 From owner-svn-src-user@freebsd.org Wed Nov 25 03:53:15 2015 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 B0957A37086 for ; Wed, 25 Nov 2015 03:53:15 +0000 (UTC) (envelope-from ngie@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 6F0EA18A3; Wed, 25 Nov 2015 03:53:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP3rEjx027723; Wed, 25 Nov 2015 03:53:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP3rECE027720; Wed, 25 Nov 2015 03:53:14 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250353.tAP3rECE027720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 03:53:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291283 - user/ngie/more-tests2/sbin/geom/class/tests/nop 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.20 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: Wed, 25 Nov 2015 03:53:15 -0000 Author: ngie Date: Wed Nov 25 03:53:14 2015 New Revision: 291283 URL: https://svnweb.freebsd.org/changeset/base/291283 Log: conf.sh: - Implement gnop_test_cleanup - Use a random name for the shsec 1_test.sh/2_test.sh: - Attach md devices with attach_md - Remove unnecessary mdconfig -d -u and gstripe destroy calls at the end of the scripts Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh Wed Nov 25 03:46:49 2015 (r291282) +++ user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh Wed Nov 25 03:53:14 2015 (r291283) @@ -5,21 +5,16 @@ echo "1..1" -us=45 +us=$(attach_md -t malloc -s 1M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 - -gnop create /dev/md${us} || exit 1 +gnop create /dev/${us} || exit 1 # Size of created device should be 1MB. -size=`diskinfo /dev/md${us}.nop | awk '{print $3}'` +size=`diskinfo /dev/${us}.nop | awk '{print $3}'` if [ $size -eq 1048576 ]; then echo "ok 1" else echo "not ok 1" fi - -gnop destroy md${us}.nop -mdconfig -d -u $us Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh Wed Nov 25 03:46:49 2015 (r291282) +++ user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh Wed Nov 25 03:53:14 2015 (r291283) @@ -3,20 +3,19 @@ . `dirname $0`/conf.sh -us=45 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 echo "1..1" dd if=/dev/random of=${src} bs=1m count=1 >/dev/null 2>&1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 +us=$(attach_md -t malloc -s 1M) || exit 1 -gnop create /dev/md${us} || exit 1 +gnop create /dev/${us} || exit 1 -dd if=${src} of=/dev/md${us}.nop bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/md${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1 +dd if=${src} of=/dev/${us}.nop bs=1m count=1 >/dev/null 2>&1 +dd if=/dev/${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 1" @@ -24,6 +23,4 @@ else echo "ok 1" fi -gnop destroy md${us}.nop -mdconfig -d -u $us rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh Wed Nov 25 03:46:49 2015 (r291282) +++ user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh Wed Nov 25 03:53:14 2015 (r291283) @@ -4,4 +4,11 @@ class="nop" base=`basename $0` +gnop_test_cleanup() +{ + [ -c /dev/${us}.nop ] && gnop destroy ${us}.nop + geom_test_cleanup +} +trap gnop_test_cleanup ABRT EXIT INT TERM + . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 03:58:00 2015 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 765DBA370CC for ; Wed, 25 Nov 2015 03:58:00 +0000 (UTC) (envelope-from ngie@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 4C33B19D2; Wed, 25 Nov 2015 03:58:00 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP3vxBp028057; Wed, 25 Nov 2015 03:57:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP3vxvJ028054; Wed, 25 Nov 2015 03:57:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250357.tAP3vxvJ028054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 03:57:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291284 - user/ngie/more-tests2/sbin/geom/class/tests/concat 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.20 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: Wed, 25 Nov 2015 03:58:00 -0000 Author: ngie Date: Wed Nov 25 03:57:58 2015 New Revision: 291284 URL: https://svnweb.freebsd.org/changeset/base/291284 Log: conf.sh: - Implement gconcat_test_cleanup - Use a random name for the shsec 1_test.sh/2_test.sh: - Attach md devices with attach_md - Remove unnecessary mdconfig -d -u and gconcat destroy calls at the end of the scripts Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh Wed Nov 25 03:53:14 2015 (r291283) +++ user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh Wed Nov 25 03:57:58 2015 (r291284) @@ -5,13 +5,11 @@ echo '1..1' -us=45 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait # Size of created device should be 1MB + 2MB + 3MB. @@ -23,8 +21,3 @@ if [ $size -eq 6291456 ]; then else echo "not ok - Size is 6291456" fi - -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh Wed Nov 25 03:53:14 2015 (r291283) +++ user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh Wed Nov 25 03:57:58 2015 (r291284) @@ -5,18 +5,17 @@ echo '1..1' -us=45 tsize=6 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 +dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait dd if=${src} of=/dev/concat/${name} bs=1m count=$tsize >/dev/null 2>&1 @@ -28,8 +27,4 @@ else echo "ok - md5 checksum comparison" fi -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` rm -f ${src} ${dst} Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh Wed Nov 25 03:53:14 2015 (r291283) +++ user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh Wed Nov 25 03:57:58 2015 (r291284) @@ -1,8 +1,15 @@ #!/bin/sh # $FreeBSD$ -name="test" +name="$(mktemp -u concat.XXXXXX)" class="concat" base=`basename $0` +gconcat_test_cleanup() +{ + [ -c /dev/$class/$name ] && gconcat destroy $name + geom_test_cleanup +} +trap gconcat_test_cleanup ABRT EXIT INT TERM + . `dirname $0`/../geom_subr.sh From owner-svn-src-user@freebsd.org Wed Nov 25 04:01:14 2015 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 EC927A371CB for ; Wed, 25 Nov 2015 04:01:14 +0000 (UTC) (envelope-from ngie@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 B53CA1BD4; Wed, 25 Nov 2015 04:01:14 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP41Dwa030781; Wed, 25 Nov 2015 04:01:13 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP41DpH030780; Wed, 25 Nov 2015 04:01:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250401.tAP41DpH030780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 04:01:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291285 - user/ngie/more-tests2/sbin/geom/class/tests/gate 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.20 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: Wed, 25 Nov 2015 04:01:15 -0000 Author: ngie Date: Wed Nov 25 04:01:13 2015 New Revision: 291285 URL: https://svnweb.freebsd.org/changeset/base/291285 Log: Probe for the first available ggate(4) device Modified: user/ngie/more-tests2/sbin/geom/class/tests/gate/1_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/gate/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/gate/1_test.sh Wed Nov 25 03:57:58 2015 (r291284) +++ user/ngie/more-tests2/sbin/geom/class/tests/gate/1_test.sh Wed Nov 25 04:01:13 2015 (r291285) @@ -4,7 +4,10 @@ . `dirname $0`/conf.sh base=`basename $0` -us=45 +us=0 +while [ -c /dev/ggate${us} ]; do + : $(( us += 1 )) +done conf=`mktemp $base.XXXXXX` || exit 1 pidfile=ggated.pid port=33080 From owner-svn-src-user@freebsd.org Wed Nov 25 04:07:32 2015 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 44CE4A37234 for ; Wed, 25 Nov 2015 04:07:32 +0000 (UTC) (envelope-from ngie@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 140F11E90; Wed, 25 Nov 2015 04:07:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP47VT4031062; Wed, 25 Nov 2015 04:07:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP47VYe031061; Wed, 25 Nov 2015 04:07:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250407.tAP47VYe031061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 04:07:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291286 - user/ngie/more-tests2/sbin/geom/class/tests/mirror 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.20 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: Wed, 25 Nov 2015 04:07:32 -0000 Author: ngie Date: Wed Nov 25 04:07:31 2015 New Revision: 291286 URL: https://svnweb.freebsd.org/changeset/base/291286 Log: Remove braces around us0, us1, and us2 in gmirror label operation Modified: user/ngie/more-tests2/sbin/geom/class/tests/mirror/1_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/mirror/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/mirror/1_test.sh Wed Nov 25 04:01:13 2015 (r291285) +++ user/ngie/more-tests2/sbin/geom/class/tests/mirror/1_test.sh Wed Nov 25 04:07:31 2015 (r291286) @@ -9,7 +9,7 @@ us0=$(attach_md -t malloc -s 1M) || exit us1=$(attach_md -t malloc -s 2M) || exit 1 us2=$(attach_md -t malloc -s 3M) || exit 1 -gmirror label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 +gmirror label $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait # Size of created device should be 1MB - 512b. From owner-svn-src-user@freebsd.org Wed Nov 25 04:10:05 2015 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 7F4E9A37260 for ; Wed, 25 Nov 2015 04:10:05 +0000 (UTC) (envelope-from ngie@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 5318E1F91; Wed, 25 Nov 2015 04:10:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP4A4EA031212; Wed, 25 Nov 2015 04:10:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP4A33j031199; Wed, 25 Nov 2015 04:10:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250410.tAP4A33j031199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 04:10:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291287 - in user/ngie/more-tests2/sbin/geom/class/tests: raid3 shsec stripe uzip 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.20 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: Wed, 25 Nov 2015 04:10:05 -0000 Author: ngie Date: Wed Nov 25 04:10:03 2015 New Revision: 291287 URL: https://svnweb.freebsd.org/changeset/base/291287 Log: Remove all explicit references to $TMPDIR Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -8,8 +8,8 @@ echo "1..1" ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/shsec/2_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -7,8 +7,8 @@ echo "1..4" nblocks1=1024 nblocks2=`expr $nblocks1 + 1` -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} count=$nblocks1 >/dev/null 2>&1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -6,8 +6,8 @@ echo "1..1" tsize=3 -src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 -dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Wed Nov 25 04:07:31 2015 (r291286) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Wed Nov 25 04:10:03 2015 (r291287) @@ -3,7 +3,7 @@ class="uzip" base=`basename $0` -mntpoint=$(mktemp -d $TMPDIR/tmp.XXXXXX) || exit +mntpoint=$(mktemp -d tmp.XXXXXX) || exit uzip_test_cleanup() { From owner-svn-src-user@freebsd.org Wed Nov 25 04:11:27 2015 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 549F5A37380 for ; Wed, 25 Nov 2015 04:11:27 +0000 (UTC) (envelope-from ngie@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 1CDF8121E; Wed, 25 Nov 2015 04:11:27 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP4BQ0k031925; Wed, 25 Nov 2015 04:11:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP4BQVL031924; Wed, 25 Nov 2015 04:11:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250411.tAP4BQVL031924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 04:11:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291288 - user/ngie/more-tests2/sbin/geom/class/tests/uzip 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.20 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: Wed, 25 Nov 2015 04:11:27 -0000 Author: ngie Date: Wed Nov 25 04:11:25 2015 New Revision: 291288 URL: https://svnweb.freebsd.org/changeset/base/291288 Log: Move the mntpoint definition down so the mktemp call get get a temporary directory under $TMPDIR instead of the current directory Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Wed Nov 25 04:10:03 2015 (r291287) +++ user/ngie/more-tests2/sbin/geom/class/tests/uzip/conf.sh Wed Nov 25 04:11:25 2015 (r291288) @@ -3,7 +3,6 @@ class="uzip" base=`basename $0` -mntpoint=$(mktemp -d tmp.XXXXXX) || exit uzip_test_cleanup() { @@ -14,3 +13,6 @@ uzip_test_cleanup() trap uzip_test_cleanup ABRT EXIT INT TERM . `dirname $0`/../geom_subr.sh + +# NOTE: make sure $TMPDIR has been set by geom_subr.sh if unset [by kyua, etc] +mntpoint=$(mktemp -d tmp.XXXXXX) || exit From owner-svn-src-user@freebsd.org Wed Nov 25 04:12:10 2015 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 03F17A373D3 for ; Wed, 25 Nov 2015 04:12:10 +0000 (UTC) (envelope-from ngie@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 C4EB81438; Wed, 25 Nov 2015 04:12:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP4C8Al031991; Wed, 25 Nov 2015 04:12:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP4C8Cp031990; Wed, 25 Nov 2015 04:12:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250412.tAP4C8Cp031990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 04:12:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291289 - user/ngie/more-tests2/sbin/geom/class/tests 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.20 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: Wed, 25 Nov 2015 04:12:10 -0000 Author: ngie Date: Wed Nov 25 04:12:08 2015 New Revision: 291289 URL: https://svnweb.freebsd.org/changeset/base/291289 Log: Make sure TMPDIR is exported so /tmp is guaranteed to be defined for mktemp Modified: user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh Wed Nov 25 04:11:25 2015 (r291288) +++ user/ngie/more-tests2/sbin/geom/class/tests/geom_subr.sh Wed Nov 25 04:12:08 2015 (r291289) @@ -22,6 +22,7 @@ devwait() # failing will cause the other tests to bomb out, or a test failing will leave # a large number of md(4) devices lingering around : ${TMPDIR=/tmp} +export TMPDIR TEST_MDS_FILE=${TMPDIR}/test_mds attach_md() From owner-svn-src-user@freebsd.org Wed Nov 25 04:13:30 2015 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 4674DA37412 for ; Wed, 25 Nov 2015 04:13:30 +0000 (UTC) (envelope-from ngie@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 113B915D5; Wed, 25 Nov 2015 04:13:29 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP4DTYT034010; Wed, 25 Nov 2015 04:13:29 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP4DT7X034009; Wed, 25 Nov 2015 04:13:29 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250413.tAP4DT7X034009@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 04:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291290 - user/ngie/more-tests2/sbin/geom/class 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.20 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: Wed, 25 Nov 2015 04:13:30 -0000 Author: ngie Date: Wed Nov 25 04:13:28 2015 New Revision: 291290 URL: https://svnweb.freebsd.org/changeset/base/291290 Log: Hook sbin/geom/class/tests in to the build Modified: user/ngie/more-tests2/sbin/geom/class/Makefile Modified: user/ngie/more-tests2/sbin/geom/class/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/Makefile Wed Nov 25 04:12:08 2015 (r291289) +++ user/ngie/more-tests2/sbin/geom/class/Makefile Wed Nov 25 04:13:28 2015 (r291290) @@ -21,4 +21,8 @@ SUBDIR+=shsec SUBDIR+=stripe SUBDIR+=virstor +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include From owner-svn-src-user@freebsd.org Thu Nov 26 01:06:05 2015 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 EAA03A354DA for ; Thu, 26 Nov 2015 01:06:05 +0000 (UTC) (envelope-from ngie@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 7C23715CE; Thu, 26 Nov 2015 01:06:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ164bO099643; Thu, 26 Nov 2015 01:06:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ15sYm099540; Thu, 26 Nov 2015 01:05:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511260105.tAQ15sYm099540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 26 Nov 2015 01:05:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291346 - in user/ngie/more-tests2: bin/rmail bin/sh cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl/lib/libzfs cddl/lib/li... 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.20 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: Thu, 26 Nov 2015 01:06:06 -0000 Author: ngie Date: Thu Nov 26 01:05:54 2015 New Revision: 291346 URL: https://svnweb.freebsd.org/changeset/base/291346 Log: MFhead @ r291345 Added: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/dtrace.test.mk - copied unchanged from r291345, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk user/ngie/more-tests2/share/ctypedef/Makefile.depend - copied unchanged from r291345, head/share/ctypedef/Makefile.depend user/ngie/more-tests2/share/dtrace/retval - copied unchanged from r291345, head/share/dtrace/retval user/ngie/more-tests2/share/monetdef/Makefile.depend - copied unchanged from r291345, head/share/monetdef/Makefile.depend user/ngie/more-tests2/share/msgdef/Makefile.depend - copied unchanged from r291345, head/share/msgdef/Makefile.depend user/ngie/more-tests2/share/numericdef/Makefile.depend - copied unchanged from r291345, head/share/numericdef/Makefile.depend user/ngie/more-tests2/share/timedef/Makefile.depend - copied unchanged from r291345, head/share/timedef/Makefile.depend user/ngie/more-tests2/sys/modules/if_enc/ - copied from r291345, head/sys/modules/if_enc/ user/ngie/more-tests2/tools/tools/indent_wrapper/ - copied from r291345, head/tools/tools/indent_wrapper/ user/ngie/more-tests2/usr.bin/cxxfilt/Makefile.depend - copied unchanged from r291345, head/usr.bin/cxxfilt/Makefile.depend user/ngie/more-tests2/usr.bin/localedef/Makefile.depend - copied unchanged from r291345, head/usr.bin/localedef/Makefile.depend Deleted: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/Makefile.inc1 user/ngie/more-tests2/lib/libmd/Makefile.depend.host user/ngie/more-tests2/usr.bin/xinstall/Makefile.depend.host Modified: user/ngie/more-tests2/bin/rmail/Makefile user/ngie/more-tests2/bin/sh/mknodes.c user/ngie/more-tests2/bin/sh/nodes.c.pat user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh user/ngie/more-tests2/contrib/bmake/parse.c user/ngie/more-tests2/crypto/openssh/sshd_config user/ngie/more-tests2/gnu/lib/libdialog/Makefile.depend user/ngie/more-tests2/gnu/lib/libgcc/Makefile.depend user/ngie/more-tests2/gnu/lib/libgomp/Makefile.depend user/ngie/more-tests2/gnu/lib/libreadline/readline/Makefile user/ngie/more-tests2/gnu/lib/libregex/Makefile.depend user/ngie/more-tests2/gnu/lib/libstdc++/Makefile user/ngie/more-tests2/gnu/lib/libstdc++/Makefile.depend user/ngie/more-tests2/gnu/lib/libsupc++/Makefile user/ngie/more-tests2/gnu/lib/libsupc++/Makefile.depend user/ngie/more-tests2/gnu/usr.bin/binutils/ld/Makefile user/ngie/more-tests2/gnu/usr.bin/cc/cc_tools/Makefile user/ngie/more-tests2/include/Makefile user/ngie/more-tests2/include/mk-osreldate.sh user/ngie/more-tests2/kerberos5/lib/libasn1/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libgssapi_krb5/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libgssapi_ntlm/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libgssapi_spnego/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libhdb/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libheimbase/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libheimipcc/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libheimipcs/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libheimntlm/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libhx509/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libkadm5clnt/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libkadm5srv/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libkafs5/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libkdc/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libkrb5/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libroken/Makefile.depend user/ngie/more-tests2/kerberos5/lib/libwind/Makefile.depend user/ngie/more-tests2/lib/atf/libatf-c++/Makefile.depend user/ngie/more-tests2/lib/atf/libatf-c/Makefile.depend user/ngie/more-tests2/lib/clang/clang.build.mk user/ngie/more-tests2/lib/libalias/libalias/Makefile.depend user/ngie/more-tests2/lib/libarchive/Makefile.depend user/ngie/more-tests2/lib/libarchive/tests/Makefile user/ngie/more-tests2/lib/libauditd/Makefile.depend user/ngie/more-tests2/lib/libbegemot/Makefile.depend user/ngie/more-tests2/lib/libblocksruntime/Makefile.depend user/ngie/more-tests2/lib/libbluetooth/Makefile.depend user/ngie/more-tests2/lib/libbsm/Makefile.depend user/ngie/more-tests2/lib/libbsnmp/libbsnmp/Makefile.depend user/ngie/more-tests2/lib/libbz2/Makefile.depend user/ngie/more-tests2/lib/libc++/Makefile user/ngie/more-tests2/lib/libc/gdtoa/Makefile.inc user/ngie/more-tests2/lib/libc/gen/Makefile.inc user/ngie/more-tests2/lib/libc/locale/Makefile.inc user/ngie/more-tests2/lib/libc/stdio/Makefile.inc user/ngie/more-tests2/lib/libc/stdlib/jemalloc/Makefile.inc user/ngie/more-tests2/lib/libc/tests/rpc/Makefile user/ngie/more-tests2/lib/libcalendar/Makefile.depend user/ngie/more-tests2/lib/libcam/Makefile.depend user/ngie/more-tests2/lib/libcapsicum/Makefile.depend user/ngie/more-tests2/lib/libcom_err/Makefile.depend user/ngie/more-tests2/lib/libcrypt/Makefile user/ngie/more-tests2/lib/libcrypt/Makefile.depend user/ngie/more-tests2/lib/libcuse/Makefile.depend user/ngie/more-tests2/lib/libcxxrt/Makefile.depend user/ngie/more-tests2/lib/libdevinfo/Makefile.depend user/ngie/more-tests2/lib/libdevstat/Makefile.depend user/ngie/more-tests2/lib/libdpv/Makefile.depend user/ngie/more-tests2/lib/libdwarf/Makefile user/ngie/more-tests2/lib/libdwarf/Makefile.depend user/ngie/more-tests2/lib/libedit/Makefile.depend user/ngie/more-tests2/lib/libelf/Makefile user/ngie/more-tests2/lib/libelf/Makefile.depend user/ngie/more-tests2/lib/libexecinfo/Makefile.depend user/ngie/more-tests2/lib/libexpat/Makefile.depend user/ngie/more-tests2/lib/libfetch/Makefile.depend user/ngie/more-tests2/lib/libfigpar/Makefile.depend user/ngie/more-tests2/lib/libgeom/Makefile.depend user/ngie/more-tests2/lib/libgpio/Makefile.depend user/ngie/more-tests2/lib/libgssapi/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/BIG5/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/DECHanyu/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/EUC/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/EUCTW/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/GBK2K/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/HZ/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/ISO2022/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/JOHAB/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/MSKanji/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/UES/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/UTF1632/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/UTF7/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/UTF8/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/VIQR/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/ZW/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/iconv_none/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/iconv_std/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/mapper_646/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/mapper_none/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/mapper_parallel/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/mapper_serial/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/mapper_std/Makefile.depend user/ngie/more-tests2/lib/libiconv_modules/mapper_zone/Makefile.depend user/ngie/more-tests2/lib/libipsec/Makefile.depend user/ngie/more-tests2/lib/libjail/Makefile.depend user/ngie/more-tests2/lib/libkiconv/Makefile.depend user/ngie/more-tests2/lib/libkvm/Makefile.depend user/ngie/more-tests2/lib/libldns/Makefile.depend user/ngie/more-tests2/lib/liblzma/Makefile.depend user/ngie/more-tests2/lib/libmagic/Makefile.depend user/ngie/more-tests2/lib/libmd/Makefile.depend user/ngie/more-tests2/lib/libmemstat/Makefile.depend user/ngie/more-tests2/lib/libmilter/Makefile user/ngie/more-tests2/lib/libmilter/Makefile.depend user/ngie/more-tests2/lib/libmp/Makefile.depend user/ngie/more-tests2/lib/libmt/Makefile.depend user/ngie/more-tests2/lib/libnetgraph/Makefile.depend user/ngie/more-tests2/lib/libngatm/Makefile.depend user/ngie/more-tests2/lib/libnv/Makefile.depend user/ngie/more-tests2/lib/libopie/Makefile.depend user/ngie/more-tests2/lib/libpam/libpam/Makefile.depend user/ngie/more-tests2/lib/libpcap/Makefile user/ngie/more-tests2/lib/libpcap/Makefile.depend user/ngie/more-tests2/lib/libpmc/Makefile.depend user/ngie/more-tests2/lib/libproc/Makefile user/ngie/more-tests2/lib/libproc/Makefile.depend user/ngie/more-tests2/lib/libprocstat/Makefile.depend user/ngie/more-tests2/lib/libradius/Makefile.depend user/ngie/more-tests2/lib/librpcsec_gss/Makefile.depend user/ngie/more-tests2/lib/librpcsvc/Makefile.depend user/ngie/more-tests2/lib/librt/Makefile.depend user/ngie/more-tests2/lib/librtld_db/Makefile user/ngie/more-tests2/lib/librtld_db/Makefile.depend user/ngie/more-tests2/lib/libsbuf/Makefile.depend user/ngie/more-tests2/lib/libsdp/Makefile.depend user/ngie/more-tests2/lib/libsm/Makefile user/ngie/more-tests2/lib/libsmb/Makefile.depend user/ngie/more-tests2/lib/libsmdb/Makefile user/ngie/more-tests2/lib/libsmutil/Makefile user/ngie/more-tests2/lib/libsqlite3/Makefile.depend user/ngie/more-tests2/lib/libstdbuf/Makefile.depend user/ngie/more-tests2/lib/libstdthreads/Makefile.depend user/ngie/more-tests2/lib/libthr/Makefile.depend user/ngie/more-tests2/lib/libthread_db/Makefile.depend user/ngie/more-tests2/lib/libucl/Makefile.depend user/ngie/more-tests2/lib/libufs/Makefile.depend user/ngie/more-tests2/lib/libugidfw/Makefile.depend user/ngie/more-tests2/lib/libulog/Makefile.depend user/ngie/more-tests2/lib/libunbound/Makefile.depend user/ngie/more-tests2/lib/libusb/Makefile.depend user/ngie/more-tests2/lib/libusbhid/Makefile.depend user/ngie/more-tests2/lib/libutil/Makefile.depend user/ngie/more-tests2/lib/libvgl/Makefile.depend user/ngie/more-tests2/lib/libvmmapi/Makefile.depend user/ngie/more-tests2/lib/libwrap/Makefile.depend user/ngie/more-tests2/lib/libxo/Makefile.depend user/ngie/more-tests2/lib/libypclnt/Makefile.depend user/ngie/more-tests2/lib/libz/Makefile.depend user/ngie/more-tests2/lib/msun/Makefile.depend user/ngie/more-tests2/lib/ncurses/form/Makefile.depend user/ngie/more-tests2/lib/ncurses/formw/Makefile.depend user/ngie/more-tests2/lib/ncurses/menu/Makefile.depend user/ngie/more-tests2/lib/ncurses/menuw/Makefile.depend user/ngie/more-tests2/lib/ncurses/ncurses/Makefile.depend user/ngie/more-tests2/lib/ncurses/ncursesw/Makefile.depend user/ngie/more-tests2/lib/ncurses/panel/Makefile.depend user/ngie/more-tests2/lib/ncurses/panelw/Makefile.depend user/ngie/more-tests2/libexec/mail.local/Makefile user/ngie/more-tests2/libexec/smrsh/Makefile user/ngie/more-tests2/release/tools/arm.subr user/ngie/more-tests2/sbin/ipf/ipf/Makefile user/ngie/more-tests2/sbin/ipf/ipftest/Makefile user/ngie/more-tests2/sbin/ipf/ipmon/Makefile user/ngie/more-tests2/sbin/ipf/ipnat/Makefile user/ngie/more-tests2/sbin/ipf/ippool/Makefile user/ngie/more-tests2/secure/lib/libcrypto/Makefile.depend user/ngie/more-tests2/secure/lib/libssh/Makefile.depend user/ngie/more-tests2/secure/lib/libssl/Makefile.depend user/ngie/more-tests2/share/colldef/Makefile.depend user/ngie/more-tests2/share/man/man4/aue.4 user/ngie/more-tests2/share/man/man4/axe.4 user/ngie/more-tests2/share/man/man4/axge.4 user/ngie/more-tests2/share/man/man4/cdce.4 user/ngie/more-tests2/share/man/man4/cue.4 user/ngie/more-tests2/share/man/man4/ipheth.4 user/ngie/more-tests2/share/man/man4/kue.4 user/ngie/more-tests2/share/man/man4/mos.4 user/ngie/more-tests2/share/man/man4/rue.4 user/ngie/more-tests2/share/man/man4/smsc.4 user/ngie/more-tests2/share/man/man4/udav.4 user/ngie/more-tests2/share/man/man4/urndis.4 user/ngie/more-tests2/share/mk/bsd.libnames.mk user/ngie/more-tests2/share/mk/bsd.own.mk user/ngie/more-tests2/share/mk/bsd.progs.mk user/ngie/more-tests2/share/mk/local.dirdeps.mk user/ngie/more-tests2/share/mk/local.gendirdeps.mk user/ngie/more-tests2/share/mk/local.init.mk user/ngie/more-tests2/share/mk/local.meta.sys.mk user/ngie/more-tests2/share/mk/local.sys.mk user/ngie/more-tests2/share/mk/meta.autodep.mk user/ngie/more-tests2/share/mk/src.libnames.mk user/ngie/more-tests2/share/mk/sys.mk user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c user/ngie/more-tests2/sys/arm/include/sf_buf.h user/ngie/more-tests2/sys/arm64/arm64/pmap.c user/ngie/more-tests2/sys/arm64/include/vmparam.h user/ngie/more-tests2/sys/boot/i386/boot2/Makefile user/ngie/more-tests2/sys/conf/NOTES user/ngie/more-tests2/sys/conf/files user/ngie/more-tests2/sys/conf/newvers.sh user/ngie/more-tests2/sys/conf/options user/ngie/more-tests2/sys/dev/ath/if_ath_rx.c user/ngie/more-tests2/sys/dev/isp/isp.c user/ngie/more-tests2/sys/dev/isp/isp_target.c user/ngie/more-tests2/sys/dev/isp/ispmbox.h user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.c user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.h user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnreg.h user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnvar.h user/ngie/more-tests2/sys/kern/kern_hhook.c user/ngie/more-tests2/sys/kern/vfs_subr.c user/ngie/more-tests2/sys/modules/Makefile user/ngie/more-tests2/sys/net/if.c user/ngie/more-tests2/sys/net/if_enc.c user/ngie/more-tests2/sys/net/if_enc.h user/ngie/more-tests2/sys/net/if_var.h user/ngie/more-tests2/sys/net80211/ieee80211_ht.c user/ngie/more-tests2/sys/netinet/in_pcb.c user/ngie/more-tests2/sys/netinet/ip_input.c user/ngie/more-tests2/sys/netinet6/ip6_input.c user/ngie/more-tests2/sys/netipsec/ipsec.c user/ngie/more-tests2/sys/netipsec/ipsec.h user/ngie/more-tests2/sys/netipsec/ipsec_input.c user/ngie/more-tests2/sys/netipsec/ipsec_output.c user/ngie/more-tests2/sys/ofed/include/rdma/ib_pma.h user/ngie/more-tests2/sys/powerpc/aim/slb.c user/ngie/more-tests2/sys/powerpc/include/atomic.h user/ngie/more-tests2/sys/sys/hhook.h user/ngie/more-tests2/sys/x86/x86/identcpu.c user/ngie/more-tests2/targets/pseudo/bootstrap-tools/Makefile user/ngie/more-tests2/targets/pseudo/hosttools/Makefile.depend user/ngie/more-tests2/targets/pseudo/stage/Makefile user/ngie/more-tests2/targets/pseudo/toolchain/Makefile.depend user/ngie/more-tests2/targets/pseudo/userland/share/Makefile.depend user/ngie/more-tests2/tests/sys/kern/acct/Makefile user/ngie/more-tests2/tools/tools/README user/ngie/more-tests2/usr.bin/awk/Makefile user/ngie/more-tests2/usr.bin/calendar/calendars/calendar.freebsd user/ngie/more-tests2/usr.bin/cpio/tests/Makefile user/ngie/more-tests2/usr.bin/kdump/Makefile user/ngie/more-tests2/usr.bin/netstat/Makefile user/ngie/more-tests2/usr.bin/netstat/inet.c user/ngie/more-tests2/usr.bin/netstat/main.c user/ngie/more-tests2/usr.bin/readelf/Makefile user/ngie/more-tests2/usr.bin/svn/svn/Makefile user/ngie/more-tests2/usr.bin/tar/tests/Makefile user/ngie/more-tests2/usr.bin/vacation/Makefile user/ngie/more-tests2/usr.sbin/acpi/iasl/Makefile user/ngie/more-tests2/usr.sbin/amd/include/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend user/ngie/more-tests2/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend user/ngie/more-tests2/usr.sbin/editmap/Makefile user/ngie/more-tests2/usr.sbin/mailstats/Makefile user/ngie/more-tests2/usr.sbin/makemap/Makefile user/ngie/more-tests2/usr.sbin/praliases/Makefile user/ngie/more-tests2/usr.sbin/sendmail/Makefile user/ngie/more-tests2/usr.sbin/syslogd/syslogd.c Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/cddl/ (props changed) user/ngie/more-tests2/contrib/bmake/ (props changed) user/ngie/more-tests2/crypto/openssh/ (props changed) user/ngie/more-tests2/gnu/lib/ (props changed) user/ngie/more-tests2/gnu/usr.bin/binutils/ (props changed) user/ngie/more-tests2/gnu/usr.bin/cc/cc_tools/ (props changed) user/ngie/more-tests2/include/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/lib/libutil/ (props changed) user/ngie/more-tests2/lib/libvmmapi/ (props changed) user/ngie/more-tests2/lib/libz/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) user/ngie/more-tests2/targets/ (props changed) user/ngie/more-tests2/usr.bin/calendar/ (props changed) Modified: user/ngie/more-tests2/bin/rmail/Makefile ============================================================================== --- user/ngie/more-tests2/bin/rmail/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/bin/rmail/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -29,7 +29,7 @@ LDFLAGS+=${SENDMAIL_LDFLAGS} # following: # CFLAGS+= -DQUEUE_ONLY -sm_os.h: - ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h +sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} .include Modified: user/ngie/more-tests2/bin/sh/mknodes.c ============================================================================== --- user/ngie/more-tests2/bin/sh/mknodes.c Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/bin/sh/mknodes.c Thu Nov 26 01:05:54 2015 (r291346) @@ -296,10 +296,10 @@ outfunc(FILE *cfile, int calcsize) else fputs(" return NULL;\n", cfile); if (calcsize) - fputs(" funcblocksize += nodesize[n->type];\n", cfile); + fputs(" result->blocksize += nodesize[n->type];\n", cfile); else { - fputs(" new = funcblock;\n", cfile); - fputs(" funcblock = (char *)funcblock + nodesize[n->type];\n", cfile); + fputs(" new = state->block;\n", cfile); + fputs(" state->block = (char *)state->block + nodesize[n->type];\n", cfile); } fputs(" switch (n->type) {\n", cfile); for (sp = str ; sp < &str[nstr] ; sp++) { @@ -313,33 +313,33 @@ outfunc(FILE *cfile, int calcsize) case T_NODE: if (calcsize) { indent(12, cfile); - fprintf(cfile, "calcsize(n->%s.%s);\n", + fprintf(cfile, "calcsize(n->%s.%s, result);\n", sp->tag, fp->name); } else { indent(12, cfile); - fprintf(cfile, "new->%s.%s = copynode(n->%s.%s);\n", + fprintf(cfile, "new->%s.%s = copynode(n->%s.%s, state);\n", sp->tag, fp->name, sp->tag, fp->name); } break; case T_NODELIST: if (calcsize) { indent(12, cfile); - fprintf(cfile, "sizenodelist(n->%s.%s);\n", + fprintf(cfile, "sizenodelist(n->%s.%s, result);\n", sp->tag, fp->name); } else { indent(12, cfile); - fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s);\n", + fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s, state);\n", sp->tag, fp->name, sp->tag, fp->name); } break; case T_STRING: if (calcsize) { indent(12, cfile); - fprintf(cfile, "funcstringsize += strlen(n->%s.%s) + 1;\n", + fprintf(cfile, "result->stringsize += strlen(n->%s.%s) + 1;\n", sp->tag, fp->name); } else { indent(12, cfile); - fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s);\n", + fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s, state);\n", sp->tag, fp->name, sp->tag, fp->name); } break; Modified: user/ngie/more-tests2/bin/sh/nodes.c.pat ============================================================================== --- user/ngie/more-tests2/bin/sh/nodes.c.pat Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/bin/sh/nodes.c.pat Thu Nov 26 01:05:54 2015 (r291346) @@ -46,19 +46,24 @@ #include "mystring.h" -static int funcblocksize; /* size of structures in function */ -static int funcstringsize; /* size of strings in node */ -static pointer funcblock; /* block to allocate function from */ -static char *funcstring; /* block to allocate strings from */ +struct nodesize { + int blocksize; /* size of structures in function */ + int stringsize; /* size of strings in node */ +}; + +struct nodecopystate { + pointer block; /* block to allocate function from */ + char *string; /* block to allocate strings from */ +}; %SIZES -static void calcsize(union node *); -static void sizenodelist(struct nodelist *); -static union node *copynode(union node *); -static struct nodelist *copynodelist(struct nodelist *); -static char *nodesavestr(const char *); +static void calcsize(union node *, struct nodesize *); +static void sizenodelist(struct nodelist *, struct nodesize *); +static union node *copynode(union node *, struct nodecopystate *); +static struct nodelist *copynodelist(struct nodelist *, struct nodecopystate *); +static char *nodesavestr(const char *, struct nodecopystate *); struct funcdef { @@ -73,18 +78,20 @@ struct funcdef { struct funcdef * copyfunc(union node *n) { + struct nodesize sz; + struct nodecopystate st; struct funcdef *fn; if (n == NULL) return NULL; - funcblocksize = offsetof(struct funcdef, n); - funcstringsize = 0; - calcsize(n); - fn = ckmalloc(funcblocksize + funcstringsize); + sz.blocksize = offsetof(struct funcdef, n); + sz.stringsize = 0; + calcsize(n, &sz); + fn = ckmalloc(sz.blocksize + sz.stringsize); fn->refcount = 1; - funcblock = (char *)fn + offsetof(struct funcdef, n); - funcstring = (char *)fn + funcblocksize; - copynode(n); + st.block = (char *)fn + offsetof(struct funcdef, n); + st.string = (char *)fn + sz.blocksize; + copynode(n, &st); return fn; } @@ -97,7 +104,7 @@ getfuncnode(struct funcdef *fn) static void -calcsize(union node *n) +calcsize(union node *n, struct nodesize *result) { %CALCSIZE } @@ -105,11 +112,11 @@ calcsize(union node *n) static void -sizenodelist(struct nodelist *lp) +sizenodelist(struct nodelist *lp, struct nodesize *result) { while (lp) { - funcblocksize += ALIGN(sizeof(struct nodelist)); - calcsize(lp->n); + result->blocksize += ALIGN(sizeof(struct nodelist)); + calcsize(lp->n, result); lp = lp->next; } } @@ -117,7 +124,7 @@ sizenodelist(struct nodelist *lp) static union node * -copynode(union node *n) +copynode(union node *n, struct nodecopystate *state) { union node *new; @@ -127,16 +134,17 @@ copynode(union node *n) static struct nodelist * -copynodelist(struct nodelist *lp) +copynodelist(struct nodelist *lp, struct nodecopystate *state) { struct nodelist *start; struct nodelist **lpp; lpp = &start; while (lp) { - *lpp = funcblock; - funcblock = (char *)funcblock + ALIGN(sizeof(struct nodelist)); - (*lpp)->n = copynode(lp->n); + *lpp = state->block; + state->block = (char *)state->block + + ALIGN(sizeof(struct nodelist)); + (*lpp)->n = copynode(lp->n, state); lp = lp->next; lpp = &(*lpp)->next; } @@ -147,15 +155,15 @@ copynodelist(struct nodelist *lp) static char * -nodesavestr(const char *s) +nodesavestr(const char *s, struct nodecopystate *state) { const char *p = s; - char *q = funcstring; - char *rtn = funcstring; + char *q = state->string; + char *rtn = state->string; while ((*q++ = *p++) != '\0') continue; - funcstring = q; + state->string = q; return rtn; } Modified: user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -8,7 +8,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libelf \ lib/libz \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -15,7 +15,6 @@ DIRDEPS = \ lib/libproc \ lib/librtld_db \ lib/libthr \ - usr.bin/xinstall.host \ usr.bin/yacc.host \ Modified: user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -8,7 +8,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -20,7 +20,6 @@ DIRDEPS = \ lib/libthr \ lib/libutil \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend ============================================================================== --- user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend Thu Nov 26 01:05:54 2015 (r291346) @@ -16,7 +16,6 @@ DIRDEPS = \ lib/libthr \ lib/libz \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -186,4 +186,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -26,4 +26,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -19,4 +19,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -34,4 +34,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -45,4 +45,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -15,4 +15,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -24,4 +24,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -21,4 +21,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -115,4 +115,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -110,4 +110,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -17,4 +17,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -25,4 +25,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -15,4 +15,4 @@ CFILES= \ tst.fds.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -33,4 +33,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -41,4 +41,4 @@ CFILES= \ tst.ProbeData.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -20,4 +20,4 @@ CFILES= \ tst.usdt.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -47,4 +47,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -31,4 +31,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ tst.call3.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -25,4 +25,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -15,4 +15,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -66,4 +66,4 @@ CFILES= \ tst.weak2.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -45,4 +45,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -22,4 +22,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -50,4 +50,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -37,4 +37,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -65,4 +65,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -21,4 +21,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -33,4 +33,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -27,4 +27,4 @@ CFILES= \ LDADD.tst.sigwait.exe+= -lrt DPADD.tst.sigwait.exe+= ${LIBRT} -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -50,4 +50,4 @@ CFILES= \ tst.ufuncsort.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -41,4 +41,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -18,4 +18,4 @@ CFILES= \ tst.raise3.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -51,4 +51,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -34,4 +34,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -46,4 +46,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ tst.sdtargs.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -28,4 +28,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -72,4 +72,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -19,4 +19,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ tst.stop2.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -17,4 +17,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -28,4 +28,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -15,4 +15,4 @@ CFILES= \ tst.args.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -16,4 +16,4 @@ CFILES= \ tst.post_chan.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -35,4 +35,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -21,4 +21,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -48,4 +48,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -66,4 +66,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -38,4 +38,4 @@ CFILES= \ WITH_CTF=YES -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -24,4 +24,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -62,4 +62,4 @@ CFILES= \ tst.forker.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -17,4 +17,4 @@ CFILES= \ tst.spin.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -20,4 +20,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile Thu Nov 26 01:05:54 2015 (r291346) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Copied: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (from r291345, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/dtrace.test.mk Thu Nov 26 01:05:54 2015 (r291346, copy of r291345, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk) @@ -0,0 +1,48 @@ +# $FreeBSD$ + +TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} +TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} +TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} + +FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE + +${TESTGROUP}= ${TESTFILES} +${TESTGROUP}EXE= ${TESTEXES} +${TESTGROUP}EXEMODE= 0555 + +TESTWRAPPER= t_dtrace_contrib +ATF_TESTS_SH+= ${TESTWRAPPER} +TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" +TEST_METADATA.t_dtrace_contrib+= required_user="root" + +GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh +EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh +${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}} + sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET} + +CLEANFILES+= ${TESTWRAPPER}.sh + +.PATH: ${TESTSRC} + +PROGS= ${CFILES:T:S/.c$/.exe/g} +.for prog in ${PROGS} +SRCS.${prog}+= ${prog:S/.exe$/.c/} + +.if exists(${prog:S/^tst.//:S/.exe$/.d/}) +SRCS.${prog}+= ${prog:S/^tst.//:S/.exe$/.d/} +.endif +.endfor + +BINDIR= ${TESTSDIR} +MAN= + +# Some tests depend on the internals of their corresponding test programs, +# so make sure the optimizer doesn't interfere with them. +CFLAGS+= -O0 + +# Test programs shouldn't be stripped; else we generally can't use the PID +# provider. +DEBUG_FLAGS= -g +STRIP= + +.include Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh ============================================================================== --- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Thu Nov 26 00:56:07 2015 (r291345) +++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Thu Nov 26 01:05:54 2015 (r291346) @@ -63,7 +63,7 @@ CFILES= \\ $tcfiles *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Thu Nov 26 06:56:16 2015 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 4737AA38D3E for ; Thu, 26 Nov 2015 06:56:16 +0000 (UTC) (envelope-from ngie@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 16BB312D7; Thu, 26 Nov 2015 06:56:16 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ6uF1K000248; Thu, 26 Nov 2015 06:56:15 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ6uF4w000247; Thu, 26 Nov 2015 06:56:15 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511260656.tAQ6uF4w000247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 26 Nov 2015 06:56:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291356 - user/ngie/more-tests2/tools/regression/lib/libc/resolv 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.20 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: Thu, 26 Nov 2015 06:56:16 -0000 Author: ngie Date: Thu Nov 26 06:56:15 2015 New Revision: 291356 URL: https://svnweb.freebsd.org/changeset/base/291356 Log: Skip over lines that start with comments Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c ============================================================================== --- user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Thu Nov 26 02:24:45 2015 (r291355) +++ user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Thu Nov 26 06:56:15 2015 (r291356) @@ -87,6 +87,8 @@ load(const char *fname) if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); while ((line = fgetln(fp, &len)) != NULL) { + if (line[0] == '#') + continue; char c = line[len]; char *ptr; line[len] = '\0'; From owner-svn-src-user@freebsd.org Thu Nov 26 06:57:12 2015 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 61CEFA38DF8 for ; Thu, 26 Nov 2015 06:57:12 +0000 (UTC) (envelope-from ngie@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 2D2A51471; Thu, 26 Nov 2015 06:57:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ6vB3g000325; Thu, 26 Nov 2015 06:57:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ6vBmv000323; Thu, 26 Nov 2015 06:57:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511260657.tAQ6vBmv000323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 26 Nov 2015 06:57:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291357 - in user/ngie/more-tests2/tools/regression/lib/libc: nss resolv 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.20 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: Thu, 26 Nov 2015 06:57:12 -0000 Author: ngie Date: Thu Nov 26 06:57:10 2015 New Revision: 291357 URL: https://svnweb.freebsd.org/changeset/base/291357 Log: - Remove cnftp.bjpu.edu.cn (it no longer resolves) - Add localhost to resolv/mach for parity with nss/mach Modified: user/ngie/more-tests2/tools/regression/lib/libc/nss/mach user/ngie/more-tests2/tools/regression/lib/libc/resolv/mach Modified: user/ngie/more-tests2/tools/regression/lib/libc/nss/mach ============================================================================== --- user/ngie/more-tests2/tools/regression/lib/libc/nss/mach Thu Nov 26 06:56:15 2015 (r291356) +++ user/ngie/more-tests2/tools/regression/lib/libc/nss/mach Thu Nov 26 06:57:10 2015 (r291357) @@ -11,7 +11,6 @@ antioche.antioche.eu.org boulder.tele.dk centaurus.4web.cz chur.math.ntnu.no -cnftp.bjpu.edu.cn console.netbsd.org cvs.fi.netbsd.org cvs.mikrolahti.fi Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/mach ============================================================================== --- user/ngie/more-tests2/tools/regression/lib/libc/resolv/mach Thu Nov 26 06:56:15 2015 (r291356) +++ user/ngie/more-tests2/tools/regression/lib/libc/resolv/mach Thu Nov 26 06:57:10 2015 (r291357) @@ -1,3 +1,5 @@ +# $FreeBSD$ +localhost above.warped.net anoncvs.cirr.com anoncvs.isc.netbsd.org @@ -9,7 +11,6 @@ antioche.antioche.eu.org boulder.tele.dk centaurus.4web.cz chur.math.ntnu.no -cnftp.bjpu.edu.cn console.netbsd.org cvs.fi.netbsd.org cvs.mikrolahti.fi From owner-svn-src-user@freebsd.org Thu Nov 26 07:06:30 2015 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 DC151A38686 for ; Thu, 26 Nov 2015 07:06:29 +0000 (UTC) (envelope-from ngie@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 8A4FB1EC7; Thu, 26 Nov 2015 07:06:29 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ76SoV003436; Thu, 26 Nov 2015 07:06:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ76Li7003360; Thu, 26 Nov 2015 07:06:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511260706.tAQ76Li7003360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 26 Nov 2015 07:06:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291360 - in user/ngie/more-tests2: contrib/wpa/src/drivers gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus lib lib/libwrap libexec/hyperv libexec/rtld-elf libexec/tcpd sbin/ifconfig share/dt... 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.20 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: Thu, 26 Nov 2015 07:06:30 -0000 Author: ngie Date: Thu Nov 26 07:06:20 2015 New Revision: 291360 URL: https://svnweb.freebsd.org/changeset/base/291360 Log: MFhead @ r291359 Modified: user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile user/ngie/more-tests2/lib/Makefile user/ngie/more-tests2/lib/libwrap/Makefile user/ngie/more-tests2/libexec/hyperv/Makefile user/ngie/more-tests2/libexec/rtld-elf/Makefile user/ngie/more-tests2/libexec/tcpd/Makefile user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c user/ngie/more-tests2/share/dtrace/Makefile user/ngie/more-tests2/share/examples/Makefile user/ngie/more-tests2/share/examples/smbfs/Makefile user/ngie/more-tests2/share/examples/smbfs/print/Makefile user/ngie/more-tests2/share/keys/pkg/trusted/Makefile user/ngie/more-tests2/share/mk/Makefile user/ngie/more-tests2/share/mk/bsd.obj.mk user/ngie/more-tests2/share/mk/local.dirdeps.mk user/ngie/more-tests2/share/mk/netbsd-tests.test.mk user/ngie/more-tests2/share/mk/src.libnames.mk user/ngie/more-tests2/share/security/Makefile user/ngie/more-tests2/share/vt/keymaps/Makefile user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c user/ngie/more-tests2/usr.bin/makewhatis/Makefile user/ngie/more-tests2/usr.bin/vgrind/Makefile user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile user/ngie/more-tests2/usr.sbin/sendmail/Makefile user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/wpa/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/sys/ (props changed) Modified: user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c ============================================================================== --- user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c Thu Nov 26 07:06:20 2015 (r291360) @@ -1497,6 +1497,8 @@ get80211opmode(struct bsd_driver_data *d } if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP) return IEEE80211_M_HOSTAP; + if (ifmr.ifm_current & IFM_IEEE80211_IBSS) + return IEEE80211_M_IBSS; if (ifmr.ifm_current & IFM_IEEE80211_MONITOR) return IEEE80211_M_MONITOR; #ifdef IEEE80211_M_MBSS Modified: user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile ============================================================================== --- user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -9,7 +9,7 @@ MAN= PROG= cc1 SRCS= main.c c-parser.c c-lang.c -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?=yes .endif Modified: user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile ============================================================================== --- user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -15,7 +15,7 @@ SRCS+= main.c cp-lang.c c-opts.c call.c search.c semantics.c tree.c typeck.c typeck2.c optimize.c \ cp-objcp-common.c cp-gimplify.c tree-mudflap.c -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?=yes .endif Modified: user/ngie/more-tests2/lib/Makefile ============================================================================== --- user/ngie/more-tests2/lib/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/lib/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -48,7 +48,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libdwarf \ libedit \ ${_libelftc} \ - ${_libevent} \ + libevent \ libexecinfo \ libexpat \ libfetch \ @@ -240,10 +240,6 @@ _libnetgraph= libnetgraph _libypclnt= libypclnt .endif -.if ${MK_PF} != "no" -_libevent= libevent -.endif - .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _libsmb= libsmb _libvgl= libvgl Modified: user/ngie/more-tests2/lib/libwrap/Makefile ============================================================================== --- user/ngie/more-tests2/lib/libwrap/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/lib/libwrap/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -17,7 +17,7 @@ MLINKS= hosts_access.3 hosts_ctl.3 \ .PATH: ${.CURDIR}/../../contrib/tcp_wrappers CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \ - -DREAL_DAEMON_DIR=\"/usr/libexec\" -DPROCESS_OPTIONS \ + -DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" -DPROCESS_OPTIONS \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS Modified: user/ngie/more-tests2/libexec/hyperv/Makefile ============================================================================== --- user/ngie/more-tests2/libexec/hyperv/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/libexec/hyperv/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -2,9 +2,8 @@ .PATH: ${.CURDIR}/../../contrib/hyperv/tools/scripts -BINDIR= /usr/libexec/hyperv +BINDIR= ${LIBEXECDIR}/hyperv SCRIPTS= hv_set_ifconfig hv_get_dns_info hv_get_dhcp_info -NO_OBJ= .include Modified: user/ngie/more-tests2/libexec/rtld-elf/Makefile ============================================================================== --- user/ngie/more-tests2/libexec/rtld-elf/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/libexec/rtld-elf/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -32,7 +32,7 @@ WARNS?= 2 INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec -SYMLINKS= ${BINDIR}/${PROG} /usr/libexec/${PROG} +SYMLINKS= ${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 Modified: user/ngie/more-tests2/libexec/tcpd/Makefile ============================================================================== --- user/ngie/more-tests2/libexec/tcpd/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/libexec/tcpd/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -7,7 +7,7 @@ PROG= tcpd MAN= tcpd.8 CSTD?= c89 -CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ +CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DFACILITY=LOG_DAEMON Modified: user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c ============================================================================== --- user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c Thu Nov 26 07:06:20 2015 (r291360) @@ -4085,6 +4085,8 @@ get80211opmode(int s) } if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP) return IEEE80211_M_HOSTAP; + if (ifmr.ifm_current & IFM_IEEE80211_IBSS) + return IEEE80211_M_IBSS; if (ifmr.ifm_current & IFM_IEEE80211_MONITOR) return IEEE80211_M_MONITOR; if (ifmr.ifm_current & IFM_IEEE80211_MBSS) Modified: user/ngie/more-tests2/share/dtrace/Makefile ============================================================================== --- user/ngie/more-tests2/share/dtrace/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/dtrace/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -26,6 +26,4 @@ SCRIPTS= blocking \ SCRIPTSDIR= ${SHAREDIR}/dtrace -NO_OBJ= - .include Modified: user/ngie/more-tests2/share/examples/Makefile ============================================================================== --- user/ngie/more-tests2/share/examples/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/examples/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -187,8 +187,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ BINDIR= ${SHAREDIR}/examples -NO_OBJ= - .if ${MK_HAST} != "no" LDIRS+= hast XFILES+= hast/ucarp.sh \ Modified: user/ngie/more-tests2/share/examples/smbfs/Makefile ============================================================================== --- user/ngie/more-tests2/share/examples/smbfs/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/examples/smbfs/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc Modified: user/ngie/more-tests2/share/examples/smbfs/print/Makefile ============================================================================== --- user/ngie/more-tests2/share/examples/smbfs/print/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/examples/smbfs/print/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,6 +1,5 @@ # $FreeBSD$ -NO_OBJ= FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj Modified: user/ngie/more-tests2/share/keys/pkg/trusted/Makefile ============================================================================== --- user/ngie/more-tests2/share/keys/pkg/trusted/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/keys/pkg/trusted/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILES= pkg.freebsd.org.2013102301 FILESDIR= ${SHAREDIR}/keys/pkg/trusted Modified: user/ngie/more-tests2/share/mk/Makefile ============================================================================== --- user/ngie/more-tests2/share/mk/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/mk/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -58,7 +58,6 @@ FILES= \ sys.dependfile.mk \ version_gen.awk -NO_OBJ= FILESDIR= ${BINDIR}/mk .if ${MK_TESTS} != "no" Modified: user/ngie/more-tests2/share/mk/bsd.obj.mk ============================================================================== --- user/ngie/more-tests2/share/mk/bsd.obj.mk Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/mk/bsd.obj.mk Thu Nov 26 07:06:20 2015 (r291360) @@ -55,10 +55,13 @@ CANONICALOBJDIR= ${.OBJDIR} CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != "" CANONICALOBJDIR:=${MAKEOBJDIR} +OBJTOP?= ${MAKEOBJDIR} .else CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif +OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} + # # Warn of unorthodox object directory. # Modified: user/ngie/more-tests2/share/mk/local.dirdeps.mk ============================================================================== --- user/ngie/more-tests2/share/mk/local.dirdeps.mk Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/mk/local.dirdeps.mk Thu Nov 26 07:06:20 2015 (r291360) @@ -40,7 +40,7 @@ ____: # allowed to be built though since they are never installed. _need_host_libs= .for lib in ${_INTERNALLIBS} -_need_host_libs+= ${LIB${lib:tu}DIR:S,^${ROOTOBJDIR}/,,} +_need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,} .endfor N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}} Modified: user/ngie/more-tests2/share/mk/netbsd-tests.test.mk ============================================================================== --- user/ngie/more-tests2/share/mk/netbsd-tests.test.mk Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/mk/netbsd-tests.test.mk Thu Nov 26 07:06:20 2015 (r291360) @@ -3,8 +3,6 @@ .if !target(__netbsd_tests.test.mk__) __netbsd_tests.test.mk__: -OBJTOP?= ${.OBJDIR:S/${RELDIR}//} - TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H} .if !exists(${TESTSRC}/) Modified: user/ngie/more-tests2/share/mk/src.libnames.mk ============================================================================== --- user/ngie/more-tests2/share/mk/src.libnames.mk Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/mk/src.libnames.mk Thu Nov 26 07:06:20 2015 (r291360) @@ -12,12 +12,6 @@ ____: .include -.if ${.OBJDIR:S,${.CURDIR},,} != ${.OBJDIR} -ROOTOBJDIR= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} -.elif defined(OBJTOP) && ${.OBJDIR:M${OBJTOP}*} != "" -ROOTOBJDIR= ${OBJTOP} -.endif - _PRIVATELIBS= \ atf_c \ atf_cxx \ @@ -311,127 +305,127 @@ LDADD+= ${LDADD_${_l}} .error Missing ${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/DPADD_/} variable add "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//}" to _LIBRARIES, _INTERNALLIBS, or _PRIVATELIBS and define "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/LIB/:tu}". .endif -LIBELFTCDIR= ${ROOTOBJDIR}/lib/libelftc +LIBELFTCDIR= ${OBJTOP}/lib/libelftc LIBELFTC?= ${LIBELFTCDIR}/libelftc.a -LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline +LIBREADLINEDIR= ${OBJTOP}/gnu/lib/libreadline/readline LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a -LIBOPENBSDDIR= ${ROOTOBJDIR}/lib/libopenbsd +LIBOPENBSDDIR= ${OBJTOP}/lib/libopenbsd LIBOPENBSD?= ${LIBOPENBSDDIR}/libopenbsd.a -LIBSMDIR= ${ROOTOBJDIR}/lib/libsm +LIBSMDIR= ${OBJTOP}/lib/libsm LIBSM?= ${LIBSMDIR}/libsm.a -LIBSMDBDIR= ${ROOTOBJDIR}/lib/libsmdb +LIBSMDBDIR= ${OBJTOP}/lib/libsmdb LIBSMDB?= ${LIBSMDBDIR}/libsmdb.a -LIBSMUTILDIR= ${ROOTOBJDIR}/lib/libsmutil +LIBSMUTILDIR= ${OBJTOP}/lib/libsmutil LIBSMUTIL?= ${LIBSMDBDIR}/libsmutil.a -LIBNETBSDDIR?= ${ROOTOBJDIR}/lib/libnetbsd +LIBNETBSDDIR?= ${OBJTOP}/lib/libnetbsd LIBNETBSD?= ${LIBNETBSDDIR}/libnetbsd.a -LIBVERSDIR?= ${ROOTOBJDIR}/kerberos5/lib/libvers +LIBVERSDIR?= ${OBJTOP}/kerberos5/lib/libvers LIBVERS?= ${LIBVERSDIR}/libvers.a -LIBSLDIR= ${ROOTOBJDIR}/kerberos5/lib/libsl +LIBSLDIR= ${OBJTOP}/kerberos5/lib/libsl LIBSL?= ${LIBSLDIR}/libsl.a -LIBIPFDIR= ${ROOTOBJDIR}/sbin/ipf/libipf +LIBIPFDIR= ${OBJTOP}/sbin/ipf/libipf LIBIPF?= ${LIBIPFDIR}/libipf.a -LIBTELNETDIR= ${ROOTOBJDIR}/lib/libtelnet +LIBTELNETDIR= ${OBJTOP}/lib/libtelnet LIBTELNET?= ${LIBTELNETDIR}/libtelnet.a -LIBCRONDIR= ${ROOTOBJDIR}/usr.sbin/cron/lib +LIBCRONDIR= ${OBJTOP}/usr.sbin/cron/lib LIBCRON?= ${LIBCRONDIR}/libcron.a -LIBNTPDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libntp +LIBNTPDIR= ${OBJTOP}/usr.sbin/ntp/libntp LIBNTP?= ${LIBNTPDIR}/libntp.a -LIBNTPEVENTDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libntpevent +LIBNTPEVENTDIR= ${OBJTOP}/usr.sbin/ntp/libntpevent LIBNTPEVENT?= ${LIBNTPEVENTDIR}/libntpevent.a -LIBOPTSDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libopts +LIBOPTSDIR= ${OBJTOP}/usr.sbin/ntp/libopts LIBOTPS?= ${LIBOPTSDIR}/libopts.a -LIBPARSEDIR= ${ROOTOBJDIR}/usr.sbin/ntp/libparse +LIBPARSEDIR= ${OBJTOP}/usr.sbin/ntp/libparse LIBPARSE?= ${LIBPARSEDIR}/libparse.a -LIBLPRDIR= ${ROOTOBJDIR}/usr.sbin/lpr/common_source +LIBLPRDIR= ${OBJTOP}/usr.sbin/lpr/common_source LIBLPR?= ${LIBOPTSDIR}/liblpr.a -LIBFIFOLOGDIR= ${ROOTOBJDIR}/usr.sbin/fifolog/lib +LIBFIFOLOGDIR= ${OBJTOP}/usr.sbin/fifolog/lib LIBFIFOLOG?= ${LIBOPTSDIR}/libfifolog.a -LIBBSNMPTOOLSDIR= ${ROOTOBJDIR}/usr.sbin/bsnmpd/tools/libbsnmptools +LIBBSNMPTOOLSDIR= ${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a -LIBAMUDIR= ${ROOTOBJDIR}/usr.sbin/amd/libamu +LIBAMUDIR= ${OBJTOP}/usr.sbin/amd/libamu LIBAMU?= ${LIBAMUDIR}/libamu/libamu.a # Define a directory for each library. This is useful for adding -L in when # not using a --sysroot or for meta mode bootstrapping when there is no # Makefile.depend. These are sorted by directory. -LIBAVLDIR= ${ROOTOBJDIR}/cddl/lib/libavl -LIBCTFDIR= ${ROOTOBJDIR}/cddl/lib/libctf -LIBDTRACEDIR= ${ROOTOBJDIR}/cddl/lib/libdtrace -LIBNVPAIRDIR= ${ROOTOBJDIR}/cddl/lib/libnvpair -LIBUMEMDIR= ${ROOTOBJDIR}/cddl/lib/libumem -LIBUUTILDIR= ${ROOTOBJDIR}/cddl/lib/libuutil -LIBZFSDIR= ${ROOTOBJDIR}/cddl/lib/libzfs -LIBZFS_COREDIR= ${ROOTOBJDIR}/cddl/lib/libzfs_core -LIBZPOOLDIR= ${ROOTOBJDIR}/cddl/lib/libzpool -LIBDIALOGDIR= ${ROOTOBJDIR}/gnu/lib/libdialog -LIBGCOVDIR= ${ROOTOBJDIR}/gnu/lib/libgcov -LIBGOMPDIR= ${ROOTOBJDIR}/gnu/lib/libgomp -LIBGNUREGEXDIR= ${ROOTOBJDIR}/gnu/lib/libregex -LIBSSPDIR= ${ROOTOBJDIR}/gnu/lib/libssp -LIBSSP_NONSHAREDDIR= ${ROOTOBJDIR}/gnu/lib/libssp/libssp_nonshared -LIBSUPCPLUSPLUSDIR= ${ROOTOBJDIR}/gnu/lib/libsupc++ -LIBASN1DIR= ${ROOTOBJDIR}/kerberos5/lib/libasn1 -LIBGSSAPI_KRB5DIR= ${ROOTOBJDIR}/kerberos5/lib/libgssapi_krb5 -LIBGSSAPI_NTLMDIR= ${ROOTOBJDIR}/kerberos5/lib/libgssapi_ntlm -LIBGSSAPI_SPNEGODIR= ${ROOTOBJDIR}/kerberos5/lib/libgssapi_spnego -LIBHDBDIR= ${ROOTOBJDIR}/kerberos5/lib/libhdb -LIBHEIMBASEDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimbase -LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc -LIBHEIMIPCSDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcs -LIBHEIMNTLMDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimntlm -LIBHX509DIR= ${ROOTOBJDIR}/kerberos5/lib/libhx509 -LIBKADM5CLNTDIR= ${ROOTOBJDIR}/kerberos5/lib/libkadm5clnt -LIBKADM5SRVDIR= ${ROOTOBJDIR}/kerberos5/lib/libkadm5srv -LIBKAFS5DIR= ${ROOTOBJDIR}/kerberos5/lib/libkafs5 -LIBKDCDIR= ${ROOTOBJDIR}/kerberos5/lib/libkdc -LIBKRB5DIR= ${ROOTOBJDIR}/kerberos5/lib/libkrb5 -LIBROKENDIR= ${ROOTOBJDIR}/kerberos5/lib/libroken -LIBWINDDIR= ${ROOTOBJDIR}/kerberos5/lib/libwind -LIBALIASDIR= ${ROOTOBJDIR}/lib/libalias/libalias -LIBBLOCKSRUNTIMEDIR= ${ROOTOBJDIR}/lib/libblocksruntime -LIBBSNMPDIR= ${ROOTOBJDIR}/lib/libbsnmp/libbsnmp -LIBBSDXMLDIR= ${ROOTOBJDIR}/lib/libexpat -LIBKVMDIR= ${ROOTOBJDIR}/lib/libkvm -LIBPTHREADDIR= ${ROOTOBJDIR}/lib/libthr -LIBMDIR= ${ROOTOBJDIR}/lib/msun -LIBFORMDIR= ${ROOTOBJDIR}/lib/ncurses/form -LIBFORMLIBWDIR= ${ROOTOBJDIR}/lib/ncurses/formw -LIBMENUDIR= ${ROOTOBJDIR}/lib/ncurses/menu -LIBMENULIBWDIR= ${ROOTOBJDIR}/lib/ncurses/menuw -LIBTERMCAPDIR= ${ROOTOBJDIR}/lib/ncurses/ncurses -LIBTERMCAPWDIR= ${ROOTOBJDIR}/lib/ncurses/ncursesw -LIBPANELDIR= ${ROOTOBJDIR}/lib/ncurses/panel -LIBPANELWDIR= ${ROOTOBJDIR}/lib/ncurses/panelw -LIBCRYPTODIR= ${ROOTOBJDIR}/secure/lib/libcrypto -LIBSSHDIR= ${ROOTOBJDIR}/secure/lib/libssh -LIBSSLDIR= ${ROOTOBJDIR}/secure/lib/libssl -LIBTEKENDIR= ${ROOTOBJDIR}/sys/teken/libteken -LIBEGACYDIR= ${ROOTOBJDIR}/tools/build -LIBLNDIR= ${ROOTOBJDIR}/usr.bin/lex/lib +LIBAVLDIR= ${OBJTOP}/cddl/lib/libavl +LIBCTFDIR= ${OBJTOP}/cddl/lib/libctf +LIBDTRACEDIR= ${OBJTOP}/cddl/lib/libdtrace +LIBNVPAIRDIR= ${OBJTOP}/cddl/lib/libnvpair +LIBUMEMDIR= ${OBJTOP}/cddl/lib/libumem +LIBUUTILDIR= ${OBJTOP}/cddl/lib/libuutil +LIBZFSDIR= ${OBJTOP}/cddl/lib/libzfs +LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core +LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool +LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog +LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov +LIBGOMPDIR= ${OBJTOP}/gnu/lib/libgomp +LIBGNUREGEXDIR= ${OBJTOP}/gnu/lib/libregex +LIBSSPDIR= ${OBJTOP}/gnu/lib/libssp +LIBSSP_NONSHAREDDIR= ${OBJTOP}/gnu/lib/libssp/libssp_nonshared +LIBSUPCPLUSPLUSDIR= ${OBJTOP}/gnu/lib/libsupc++ +LIBASN1DIR= ${OBJTOP}/kerberos5/lib/libasn1 +LIBGSSAPI_KRB5DIR= ${OBJTOP}/kerberos5/lib/libgssapi_krb5 +LIBGSSAPI_NTLMDIR= ${OBJTOP}/kerberos5/lib/libgssapi_ntlm +LIBGSSAPI_SPNEGODIR= ${OBJTOP}/kerberos5/lib/libgssapi_spnego +LIBHDBDIR= ${OBJTOP}/kerberos5/lib/libhdb +LIBHEIMBASEDIR= ${OBJTOP}/kerberos5/lib/libheimbase +LIBHEIMIPCCDIR= ${OBJTOP}/kerberos5/lib/libheimipcc +LIBHEIMIPCSDIR= ${OBJTOP}/kerberos5/lib/libheimipcs +LIBHEIMNTLMDIR= ${OBJTOP}/kerberos5/lib/libheimntlm +LIBHX509DIR= ${OBJTOP}/kerberos5/lib/libhx509 +LIBKADM5CLNTDIR= ${OBJTOP}/kerberos5/lib/libkadm5clnt +LIBKADM5SRVDIR= ${OBJTOP}/kerberos5/lib/libkadm5srv +LIBKAFS5DIR= ${OBJTOP}/kerberos5/lib/libkafs5 +LIBKDCDIR= ${OBJTOP}/kerberos5/lib/libkdc +LIBKRB5DIR= ${OBJTOP}/kerberos5/lib/libkrb5 +LIBROKENDIR= ${OBJTOP}/kerberos5/lib/libroken +LIBWINDDIR= ${OBJTOP}/kerberos5/lib/libwind +LIBALIASDIR= ${OBJTOP}/lib/libalias/libalias +LIBBLOCKSRUNTIMEDIR= ${OBJTOP}/lib/libblocksruntime +LIBBSNMPDIR= ${OBJTOP}/lib/libbsnmp/libbsnmp +LIBBSDXMLDIR= ${OBJTOP}/lib/libexpat +LIBKVMDIR= ${OBJTOP}/lib/libkvm +LIBPTHREADDIR= ${OBJTOP}/lib/libthr +LIBMDIR= ${OBJTOP}/lib/msun +LIBFORMDIR= ${OBJTOP}/lib/ncurses/form +LIBFORMLIBWDIR= ${OBJTOP}/lib/ncurses/formw +LIBMENUDIR= ${OBJTOP}/lib/ncurses/menu +LIBMENULIBWDIR= ${OBJTOP}/lib/ncurses/menuw +LIBTERMCAPDIR= ${OBJTOP}/lib/ncurses/ncurses +LIBTERMCAPWDIR= ${OBJTOP}/lib/ncurses/ncursesw +LIBPANELDIR= ${OBJTOP}/lib/ncurses/panel +LIBPANELWDIR= ${OBJTOP}/lib/ncurses/panelw +LIBCRYPTODIR= ${OBJTOP}/secure/lib/libcrypto +LIBSSHDIR= ${OBJTOP}/secure/lib/libssh +LIBSSLDIR= ${OBJTOP}/secure/lib/libssl +LIBTEKENDIR= ${OBJTOP}/sys/teken/libteken +LIBEGACYDIR= ${OBJTOP}/tools/build +LIBLNDIR= ${OBJTOP}/usr.bin/lex/lib # Default other library directories to lib/libNAME. .for lib in ${_LIBRARIES} -LIB${lib:tu}DIR?= ${ROOTOBJDIR}/lib/lib${lib} +LIB${lib:tu}DIR?= ${OBJTOP}/lib/lib${lib} .endfor .endif # !target(____) Modified: user/ngie/more-tests2/share/security/Makefile ============================================================================== --- user/ngie/more-tests2/share/security/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/security/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,6 @@ # $FreeBSD$ FILES= lomac-policy.contexts -NO_OBJ= FILESDIR= ${BINDIR}/security .include "${.CURDIR}/../Makefile.inc" Modified: user/ngie/more-tests2/share/vt/keymaps/Makefile ============================================================================== --- user/ngie/more-tests2/share/vt/keymaps/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/share/vt/keymaps/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -88,6 +88,4 @@ FILES= INDEX.keymaps \ FILESDIR= ${SHAREDIR}/vt/keymaps -NO_OBJ= - .include Modified: user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c ============================================================================== --- user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c Thu Nov 26 07:06:20 2015 (r291360) @@ -2807,6 +2807,9 @@ ieee80211_ioctl_set80211(struct ieee8021 /* XXX verify ciphers available */ flags = vap->iv_flags & ~IEEE80211_F_WPA; switch (ireq->i_val) { + case 0: + /* wpa_supplicant calls this to clear the WPA config */ + break; case 1: if (!(vap->iv_caps & IEEE80211_C_WPA1)) return EOPNOTSUPP; Modified: user/ngie/more-tests2/usr.bin/makewhatis/Makefile ============================================================================== --- user/ngie/more-tests2/usr.bin/makewhatis/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.bin/makewhatis/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -4,7 +4,7 @@ PROG= makewhatis LIBADD= z SCRIPTS= makewhatis.local.sh MAN= makewhatis.1 makewhatis.local.8 -SCRIPTSDIR= /usr/libexec +SCRIPTSDIR= ${LIBEXECDIR} LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local MLINKS= makewhatis.local.8 catman.local.8 Modified: user/ngie/more-tests2/usr.bin/vgrind/Makefile ============================================================================== --- user/ngie/more-tests2/usr.bin/vgrind/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.bin/vgrind/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -13,7 +13,7 @@ MAN= vgrind.1 vgrindefs.5 WARNS?= 3 -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} SCRIPTSDIR=/usr/bin CLEANFILES= vgrindefs.src.db Modified: user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile ============================================================================== --- user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -11,7 +11,7 @@ LIBADD= l m CFLAGS+= -I. -I${.CURDIR} LINTFLAGS=-aehpz -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .PATH: ${.CURDIR}/../common Modified: user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile ============================================================================== --- user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -9,6 +9,6 @@ MAN= CFLAGS+=-I${.CURDIR}/../lint1 LINTFLAGS=-abehrz -BINDIR= /usr/libexec +BINDIR= ${LIBEXECDIR} .include Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/dot Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/dot/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/examples/bsdconfig FILES= add_some_packages.sh browse_packages_http.sh bsdconfigrc Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/include FILES= bsdconfig.hlp media.hlp messages.subr network_device.hlp \ options.hlp tcp.hlp usage.hlp Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/includes Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/includes/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/networking FILES= common.subr device.subr hostname.subr ipaddr.subr media.subr \ netmask.subr resolv.subr routing.subr services.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/password FILES= password.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security/include FILES= messages.subr securelevel.hlp Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= media packages FILESDIR= ${SHAREDIR}/bsdconfig Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/media FILES= any.subr cdrom.subr common.subr directory.subr dos.subr \ floppy.subr ftp.subr http.subr httpproxy.subr network.subr \ Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/packages FILES= categories.subr index.subr musthavepkg.subr packages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/startup FILES= rcconf.subr rcedit.subr rcvar.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/timezone FILES= continents.subr countries.subr iso3166.subr menus.subr \ zones.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys/include FILES= messages.subr Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt/include FILES= messages.subr usermgmt.hlp Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,5 @@ # $FreeBSD$ -NO_OBJ= - FILESDIR= ${SHAREDIR}/bsdconfig/usermgmt FILES= group.subr group_input.subr user.subr user_input.subr Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract LIBADD= archive dpv figpar ncursesw dialog m Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch LIBADD= fetch ncursesw dialog m Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,6 +1,6 @@ # $FreeBSD$ -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -3,7 +3,7 @@ SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \ keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \ rootpass script services time umount wlanconfig zfsboot -BINDIR= /usr/libexec/bsdinstall +BINDIR= ${LIBEXECDIR}/bsdinstall MAN= Modified: user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -BINDIR= /usr/libexec/lpr +BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= Modified: user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -7,7 +7,7 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc PROG= rpc.yppasswdd SCRIPTS=yppwupdate -SCRIPTSDIR= /usr/libexec +SCRIPTSDIR= ${LIBEXECDIR} MAN= rpc.yppasswdd.8 SRCS= util.c yp_access.c yp_dblookup.c yp_dbwrite.c \ yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS} Modified: user/ngie/more-tests2/usr.sbin/sendmail/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/sendmail/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/sendmail/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -7,7 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/se SMDIR= ${SENDMAIL_DIR}/src .PATH: ${SMDIR} -BINDIR= /usr/libexec/sendmail +BINDIR= ${LIBEXECDIR}/sendmail PROG= sendmail MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 Modified: user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -8,7 +8,7 @@ PROG= tcpdchk MAN= tcpdchk.8 SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c -CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ +CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" .if ${MK_INET6_SUPPORT} != "no" Modified: user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile ============================================================================== --- user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile Thu Nov 26 07:03:59 2015 (r291359) +++ user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile Thu Nov 26 07:06:20 2015 (r291360) @@ -8,7 +8,7 @@ PROG= tcpdmatch MAN= tcpdmatch.8 SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c -CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \ +CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 From owner-svn-src-user@freebsd.org Thu Nov 26 07:55:21 2015 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 CA828A38DC4 for ; Thu, 26 Nov 2015 07:55:21 +0000 (UTC) (envelope-from ngie@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 961AF1164; Thu, 26 Nov 2015 07:55:21 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ7tK5D017463; Thu, 26 Nov 2015 07:55:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ7tK9q017462; Thu, 26 Nov 2015 07:55:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511260755.tAQ7tK9q017462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 26 Nov 2015 07:55:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291361 - user/ngie/more-tests2/tools/regression/lib/libc/resolv 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.20 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: Thu, 26 Nov 2015 07:55:21 -0000 Author: ngie Date: Thu Nov 26 07:55:20 2015 New Revision: 291361 URL: https://svnweb.freebsd.org/changeset/base/291361 Log: r291359 was incorrect. Skip over tokens that start with `#' as fgetln can return more than one '\n' delimited line in a buffer Handle empty lines too, just in case MFC after: 3 days X-MFC with: r291359 Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Modified: user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c ============================================================================== --- user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Thu Nov 26 07:06:20 2015 (r291360) +++ user/ngie/more-tests2/tools/regression/lib/libc/resolv/resolv.c Thu Nov 26 07:55:20 2015 (r291361) @@ -87,13 +87,14 @@ load(const char *fname) if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); while ((line = fgetln(fp, &len)) != NULL) { - if (line[0] == '#') - continue; char c = line[len]; char *ptr; line[len] = '\0'; - for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) + for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) { + if (ptr == '\0' || ptr[0] == '#') + continue; sl_add(hosts, strdup(ptr)); + } line[len] = c; } From owner-svn-src-user@freebsd.org Sat Nov 28 09:34:48 2015 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 16648A3A975 for ; Sat, 28 Nov 2015 09:34:48 +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 D34741F9F; Sat, 28 Nov 2015 09:34:47 +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 tAS9Yk3Z094340; Sat, 28 Nov 2015 09:34:46 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAS9Yj1Q094325; Sat, 28 Nov 2015 09:34:45 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201511280934.tAS9Yj1Q094325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 28 Nov 2015 09:34:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291421 - in user/pho/stress2: misc testcases/thr1 testcases/thr2 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.20 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: Sat, 28 Nov 2015 09:34:48 -0000 Author: pho Date: Sat Nov 28 09:34:45 2015 New Revision: 291421 URL: https://svnweb.freebsd.org/changeset/base/291421 Log: Fix pthread error handling. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/db.sh user/pho/stress2/misc/devfd.sh user/pho/stress2/misc/devfs2.sh user/pho/stress2/misc/f_offset.sh user/pho/stress2/misc/kevent2.sh user/pho/stress2/misc/kinfo3.sh user/pho/stress2/misc/mmap2.sh user/pho/stress2/misc/mmap3.sh user/pho/stress2/misc/pthread5.sh user/pho/stress2/misc/pthread9.sh user/pho/stress2/misc/truss.sh user/pho/stress2/testcases/thr1/thr1.c user/pho/stress2/testcases/thr2/thr2.c Modified: user/pho/stress2/misc/db.sh ============================================================================== --- user/pho/stress2/misc/db.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/db.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -40,7 +40,6 @@ mycc -o db -Wall -Wextra -O0 -g db.c -lp rm -f db.c cd $odir -diskimage=/var/tmp/diskimage dd if=/dev/zero of=$diskimage bs=1m count=10 2>&1 | \ egrep -v "records|transferred" @@ -89,16 +88,17 @@ wt(void *arg __unused) time_t start; int64_t pos; void *c; + int r; char buf[BZ]; #ifdef __NP__ pthread_set_name_np(pthread_self(), __func__); #endif - if (pthread_mutex_lock(&mutex) == -1) - err(1, "pthread_mutex_lock"); + if ((r = pthread_mutex_lock(&mutex)) != 0) + errc(1, r, "pthread_mutex_lock"); wthreads++; - if (pthread_mutex_unlock(&mutex) == -1) - err(1, "pthread_mutex_unlock"); + if ((r = pthread_mutex_unlock(&mutex)) != 0) + errc(1, r, "pthread_mutex_unlock"); start = time(NULL); while (time(NULL) - start < RUNTIME) { @@ -112,11 +112,11 @@ wt(void *arg __unused) usleep(10000 + arc4random() % 1000); } - if (pthread_mutex_lock(&mutex) == -1) - err(1, "pthread_mutex_lock"); + if ((r = pthread_mutex_lock(&mutex)) != 0) + errc(1, r, "pthread_mutex_lock"); wthreads--; - if (pthread_mutex_unlock(&mutex) == -1) - err(1, "pthread_mutex_unlock"); + if ((r = pthread_mutex_unlock(&mutex)) != 0) + errc(1, r, "pthread_mutex_unlock"); return (NULL); } Modified: user/pho/stress2/misc/devfd.sh ============================================================================== --- user/pho/stress2/misc/devfd.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/devfd.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -115,14 +115,15 @@ int main(void) { pthread_t p1, p2; + int r; close(0); close(1); close(2); - if (pthread_create(&p1, NULL, thr1, NULL) != 0) - err(1, "pthread_create"); - if (pthread_create(&p2, NULL, thr2, NULL) != 0) - err(1, "pthread_create"); + if ((r = pthread_create(&p1, NULL, thr1, NULL)) != 0) + errc(1, r, "pthread_create"); + if ((r = pthread_create(&p2, NULL, thr2, NULL)) != 0) + errc(1, r, "pthread_create"); pthread_join(p1, NULL); pthread_join(p2, NULL); Modified: user/pho/stress2/misc/devfs2.sh ============================================================================== --- user/pho/stress2/misc/devfs2.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/devfs2.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -103,8 +103,8 @@ main() err(1, "pthread_create(): %s\n", strerror(r)); for (i = 0; i < 2; i++) - if (pthread_join(threads[i], NULL) != 0) - err(1, "pthread_join(%d)", i); + if ((r = pthread_join(threads[i], NULL)) != 0) + errc(1, r, "pthread_join(%d)", i); return (0); } Modified: user/pho/stress2/misc/f_offset.sh ============================================================================== --- user/pho/stress2/misc/f_offset.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/f_offset.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -141,18 +141,18 @@ main(void) for (i = 0; i < 20 && errors < 10; i++) { if ((r = pthread_create(&threads[0], NULL, t1, 0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); if ((r = pthread_create(&threads[1], NULL, t2, 0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); if ((r = pthread_create(&threads[2], NULL, t3, 0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); - if (pthread_join(threads[0], NULL) != 0) - err(1, "pthread_join(%d)", 0); - if (pthread_join(threads[1], NULL) != 0) - err(1, "pthread_join(%d)", 1); - if (pthread_join(threads[2], NULL) != 0) - err(1, "pthread_join(%d)", 2); + if ((r = pthread_join(threads[0], NULL)) != 0) + errc(1, r, "pthread_join(%d)", 0); + if ((r = pthread_join(threads[1], NULL)) != 0) + errc(1, r, "pthread_join(%d)", 1); + if ((r = pthread_join(threads[2], NULL)) != 0) + errc(1, r, "pthread_join(%d)", 2); } close(fd); if (unlink(file) == -1) Modified: user/pho/stress2/misc/kevent2.sh ============================================================================== --- user/pho/stress2/misc/kevent2.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/kevent2.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -42,9 +42,7 @@ for i in `jot 10`; do for j in `jot 12`; do /tmp/kevent2 > /dev/null 2>&1 & done - for j in `jot 12`; do - wait - done + wait done rm -f /tmp/kevent2 exit @@ -70,7 +68,7 @@ static int fd3[2]; void * thr1(void *arg) { - int n; + int n, r; int kq = -1; struct kevent ev[3]; struct timespec ts; @@ -92,13 +90,13 @@ thr1(void *arg) if (kevent(kq, ev, n, NULL, 0, NULL) < 0) err(1, "kevent(). %s:%d", __FILE__, __LINE__); - if (pthread_mutex_lock(&mutex) == -1) - err(1, "pthread_mutex_lock"); + if ((r = pthread_mutex_lock(&mutex)) != 0) + errc(1, r, "pthread_mutex_lock"); waiting = 0; - if (pthread_cond_signal(&cond) == -1) - err(1, "pthread_cond_signal"); - if (pthread_mutex_unlock(&mutex) == -1) - err(1, "pthread_mutex_unlock"); + if ((r = pthread_cond_signal(&cond)) != 0) + errc(1, r, "pthread_cond_signal"); + if ((r = pthread_mutex_unlock(&mutex)) != 0) + errc(1, r, "pthread_mutex_unlock"); n = 0; EV_SET(&ev[n], fd1[1], EVFILT_WRITE, @@ -120,14 +118,16 @@ thr1(void *arg) void * thr2(void *arg) { - if (pthread_mutex_lock(&mutex) == -1) - err(1, "pthread_mutex_lock"); + int r; + + if ((r = pthread_mutex_lock(&mutex)) != 0) + errc(1, r, "pthread_mutex_lock"); while (waiting == 1) { - if (pthread_cond_wait(&cond, &mutex) == -1) - err(1, "pthread_cond_wait"); + if ((r = pthread_cond_wait(&cond, &mutex)) != 0) + errc(1, r, "pthread_cond_wait"); } - if (pthread_mutex_unlock(&mutex) == -1) - err(1, "pthread_mutex_unlock"); + if ((r = pthread_mutex_unlock(&mutex)) != 0) + errc(1, r, "pthread_mutex_unlock"); // printf("%s:%d\n", __FILE__, __LINE__); fflush(stdout); close(fd1[0]); close(fd2[0]); @@ -152,24 +152,24 @@ main(int argc, char **argv) if (pipe(fd3) == -1) err(1, "pipe()"); - if (pthread_mutex_init(&mutex, 0) == -1) - err(1, "pthread_mutex_init"); - if (pthread_cond_init(&cond, NULL) == -1) - err(1, "pthread_cond_init"); + if ((r = pthread_mutex_init(&mutex, 0)) != 0) + errc(1, r, "pthread_mutex_init"); + if ((r = pthread_cond_init(&cond, NULL)) != 0) + errc(1, r, "pthread_cond_init"); if ((r = pthread_create(&threads[0], NULL, thr1, 0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); if ((r = pthread_create(&threads[1], NULL, thr2, 0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); - if (pthread_join(threads[0], NULL) != 0) - err(1, "pthread_join(%d)", 0); - if (pthread_join(threads[1], NULL) != 0) - err(1, "pthread_join(%d)", 1); - if (pthread_mutex_destroy(&mutex) == -1) - err(1, "pthread_mutex_destroy"); - if (pthread_cond_destroy(&cond) == -1) - err(1, "pthread_condattr_destroy"); + if ((r = pthread_join(threads[0], NULL)) != 0) + errc(1, r, "pthread_join(%d)", 0); + if ((r = pthread_join(threads[1], NULL)) != 0) + errc(1, r, "pthread_join(%d)", 1); + if ((r = pthread_mutex_destroy(&mutex)) != 0) + errc(1, r, "pthread_mutex_destroy"); + if ((r = pthread_cond_destroy(&cond)) != 0) + errc(1, r, "pthread_condattr_destroy"); } return (0); Modified: user/pho/stress2/misc/kinfo3.sh ============================================================================== --- user/pho/stress2/misc/kinfo3.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/kinfo3.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -104,11 +104,11 @@ churning(void) { if (r == 0) { for (i = 0; i < 5; i++) { if ((r = pthread_create(&threads[i], NULL, thr, 0)) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); } for (i = 0; i < 5; i++) { - if (pthread_join(threads[i], NULL) != 0) - err(1, "pthread_join(%d)", 0); + if ((r = pthread_join(threads[i], NULL)) != 0) + errc(1, r, "pthread_join(%d)", i); } bzero(buf, sizeof(buf)); Modified: user/pho/stress2/misc/mmap2.sh ============================================================================== --- user/pho/stress2/misc/mmap2.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/mmap2.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -41,7 +41,8 @@ sed '1,/^EOF/d' < $odir/$0 > mmap2.c mycc -o mmap2 -Wall -g mmap2.c -lpthread rm -f mmap2.c -for i in `jot 10`; do +start=`date '+%s'` +while [ $((`date '+%s'` - start)) -lt 600 ]; do ./mmap2 done rm -f ./mmap2 @@ -166,12 +167,12 @@ main(int argc, char **argv) for (i = 0; i < n; i++) { nr[i] = i; if ((r = pthread_create(&threads[i], NULL, thr, (void *)&nr[i])) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); } for (i = 0; i < n; i++) { - if (pthread_join(threads[i], NULL) != 0) - err(1, "pthread_join(%d)", i); + if ((r = pthread_join(threads[i], NULL)) != 0) + errc(1, r, "pthread_join(%d)", i); } return (0); Modified: user/pho/stress2/misc/mmap3.sh ============================================================================== --- user/pho/stress2/misc/mmap3.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/mmap3.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -157,12 +157,12 @@ main(int argc, char **argv) for (i = 0; i < n; i++) { nr[i] = i; if ((r = pthread_create(&threads[i], NULL, thr, (void *)&nr[i])) != 0) - err(1, "pthread_create(): %s\n", strerror(r)); + errc(1, r, "pthread_create()"); } for (i = 0; i < n; i++) { - if (pthread_join(threads[i], NULL) != 0) - err(1, "pthread_join(%d)", i); + if ((r = pthread_join(threads[i], NULL)) != 0) + errc(1, r, "pthread_join(%d)", i); } return (0); Modified: user/pho/stress2/misc/pthread5.sh ============================================================================== --- user/pho/stress2/misc/pthread5.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/pthread5.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -91,7 +91,7 @@ test(void) for (iter = 0; iter < ITER; iter++) { for (i = 0; i < num_thread; i++) { if ((rc = pthread_create(&tid[i], NULL, nicethreads, - NULL)) == -1) + NULL)) != 0) errc(1, rc, "pthread_create"); } usleep(20000); @@ -101,7 +101,7 @@ test(void) rc = pthread_mutex_unlock(&mutex); } for (i = 0; i < num_thread; i++) - if ((rc = pthread_join(tid[i], NULL)) == -1) + if ((rc = pthread_join(tid[i], NULL)) != 0) errc(1, rc, "pthread_join"); } Modified: user/pho/stress2/misc/pthread9.sh ============================================================================== --- user/pho/stress2/misc/pthread9.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/pthread9.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -147,17 +147,17 @@ test(void) int i, rc; go = 0; - if ((rc = pthread_create(&tid[0], NULL, t1, NULL)) == -1) + if ((rc = pthread_create(&tid[0], NULL, t1, NULL)) != 0) errc(1, rc, "pthread_create"); - if ((rc = pthread_create(&tid[1], NULL, t2, NULL)) == -1) + if ((rc = pthread_create(&tid[1], NULL, t2, NULL)) != 0) errc(1, rc, "pthread_create"); - if ((rc = pthread_create(&tid[2], NULL, t3, NULL)) == -1) + if ((rc = pthread_create(&tid[2], NULL, t3, NULL)) != 0) errc(1, rc, "pthread_create"); usleep(200); atomic_add_int(&go, 1); for (i = 0; i < 3; i++) { - if ((rc = pthread_join(tid[i], NULL)) == -1) + if ((rc = pthread_join(tid[i], NULL)) != 0) errc(1, rc, "pthread_join"); } Modified: user/pho/stress2/misc/truss.sh ============================================================================== --- user/pho/stress2/misc/truss.sh Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/misc/truss.sh Sat Nov 28 09:34:45 2015 (r291421) @@ -115,13 +115,13 @@ main(int argc, char *argv[]) start = time(NULL); while ((time(NULL) - start) < runtime) { for (i = 0; i < THREADS; i++) { - if ((rc = pthread_create(&tid[i], NULL, t1, NULL)) == - -1) + if ((rc = pthread_create(&tid[i], NULL, t1, NULL)) != + 0) errc(1, rc, "pthread_create"); } for (i = 0; i < THREADS; i++) { - if ((rc = pthread_join(tid[i], NULL)) == -1) + if ((rc = pthread_join(tid[i], NULL)) != 0) errc(1, rc, "pthread_join"); } } Modified: user/pho/stress2/testcases/thr1/thr1.c ============================================================================== --- user/pho/stress2/testcases/thr1/thr1.c Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/testcases/thr1/thr1.c Sat Nov 28 09:34:45 2015 (r291421) @@ -71,8 +71,8 @@ test(void) err(1, "pthread_create(): %s\n", strerror(r)); for (i = 0; i < NTHREADS; i++) - if (pthread_join(threads[i], NULL) != 0) - err(1, "pthread_join(%d)", i); + if ((r = pthread_join(threads[i], NULL)) != 0) + errc(1, r, "pthread_join(%d)", i); return (0); } Modified: user/pho/stress2/testcases/thr2/thr2.c ============================================================================== --- user/pho/stress2/testcases/thr2/thr2.c Sat Nov 28 08:49:07 2015 (r291420) +++ user/pho/stress2/testcases/thr2/thr2.c Sat Nov 28 09:34:45 2015 (r291421) @@ -89,8 +89,8 @@ test(void) done = 1; for (i = 0; i < NTHREADS; i++) - if (pthread_join(threads[i], NULL) != 0) - err(1, "pthread_join(%d)", i); + if ((r = pthread_join(threads[i], NULL)) != 0) + errc(1, r, "pthread_join(%d)", i); return (0); } From owner-svn-src-user@freebsd.org Sat Nov 28 09:42:55 2015 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 DF9A6A3ABD2 for ; Sat, 28 Nov 2015 09:42:54 +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 B83F11470; Sat, 28 Nov 2015 09:42:54 +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 tAS9gr58097494; Sat, 28 Nov 2015 09:42:53 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAS9gqXA097476; Sat, 28 Nov 2015 09:42:52 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201511280942.tAS9gqXA097476@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 28 Nov 2015 09:42:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291422 - 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.20 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: Sat, 28 Nov 2015 09:42:55 -0000 Author: pho Date: Sat Nov 28 09:42:52 2015 New Revision: 291422 URL: https://svnweb.freebsd.org/changeset/base/291422 Log: Fix wait usage in shell scripts. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/misc/alternativeFlushPath.sh user/pho/stress2/misc/devfs.sh user/pho/stress2/misc/fdescfs.sh user/pho/stress2/misc/fuse2.sh user/pho/stress2/misc/isofs.sh user/pho/stress2/misc/pfl2.sh user/pho/stress2/misc/procfs.sh user/pho/stress2/misc/pthread3.sh user/pho/stress2/misc/pthread4.sh user/pho/stress2/misc/quota10.sh user/pho/stress2/misc/recursiveflushes.sh user/pho/stress2/misc/revoke.sh user/pho/stress2/misc/suj30.sh user/pho/stress2/misc/tmpfs2.sh user/pho/stress2/misc/umountf4.sh user/pho/stress2/misc/umountf6.sh user/pho/stress2/misc/vunref.sh Modified: user/pho/stress2/misc/alternativeFlushPath.sh ============================================================================== --- user/pho/stress2/misc/alternativeFlushPath.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/alternativeFlushPath.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -54,9 +54,7 @@ rm -f alternativeFlushPath.c for j in `jot 10`; do /tmp/alternativeFlushPath & done -for j in `jot 10`; do - wait -done +wait sysctl vfs.altbufferflushes rm -rf /tmp/alternativeFlushPath $dir Modified: user/pho/stress2/misc/devfs.sh ============================================================================== --- user/pho/stress2/misc/devfs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/devfs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -47,10 +47,7 @@ if [ $# -eq 0 ]; then ./$0 $i & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then while [ -r $cont ]; do Modified: user/pho/stress2/misc/fdescfs.sh ============================================================================== --- user/pho/stress2/misc/fdescfs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/fdescfs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -47,10 +47,7 @@ if [ $# -eq 0 ]; then ./$0 $i & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then exec 6< /dev/zero Modified: user/pho/stress2/misc/fuse2.sh ============================================================================== --- user/pho/stress2/misc/fuse2.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/fuse2.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -61,10 +61,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) Modified: user/pho/stress2/misc/isofs.sh ============================================================================== --- user/pho/stress2/misc/isofs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/isofs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -54,9 +54,7 @@ mount -t cd9660 /dev/md${mdstart} $mntpo for i in `jot 64`; do find /$mntpoint -type f > /dev/null 2>&1 & done -for i in `jot 64`; do - wait -done +wait umount ${mntpoint} mdconfig -d -u ${mdstart} Modified: user/pho/stress2/misc/pfl2.sh ============================================================================== --- user/pho/stress2/misc/pfl2.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/pfl2.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -92,7 +92,7 @@ export TESTPROGS="$TESTPROGS testcases/s export RUNDIR=$mp2/stressX export CTRLDIR=$mp2/stressX.control su $testuser -c 'cd ..; ./testcases/run/run $TESTPROGS' > /dev/null 2>&1 & -wait; wait +wait while mount | grep "$mp2 " | grep -q /dev/md; do umount $mp2 || sleep 1 Modified: user/pho/stress2/misc/procfs.sh ============================================================================== --- user/pho/stress2/misc/procfs.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/procfs.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -49,10 +49,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find $m > /dev/null 2>&1 & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then while [ -r /tmp/$0 ]; do Modified: user/pho/stress2/misc/pthread3.sh ============================================================================== --- user/pho/stress2/misc/pthread3.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/pthread3.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -41,9 +41,7 @@ rm -f pthread3.c for i in `jot 8`; do /tmp/pthread3 & done -for i in `jot 8`; do - wait -done +wait rm -f /tmp/pthread3 Modified: user/pho/stress2/misc/pthread4.sh ============================================================================== --- user/pho/stress2/misc/pthread4.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/pthread4.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -46,9 +46,7 @@ for i in `jot 5`; do for i in `jot 8`; do /tmp/pthread4 & done - for i in `jot 8`; do - wait - done + wait ' done > $log 2>&1 rm -f /tmp/pthread4 Modified: user/pho/stress2/misc/quota10.sh ============================================================================== --- user/pho/stress2/misc/quota10.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/quota10.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -65,10 +65,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find $m & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) @@ -87,7 +84,7 @@ else else # The test: Parallel mount and unmounts - for i in `jot 1000`; do + for i in `jot 200`; do m=$1 opt=`[ $(( m % 2 )) -eq 0 ] && echo -f` mount $opt /dev/md${m}${part} ${mntpoint}$m Modified: user/pho/stress2/misc/recursiveflushes.sh ============================================================================== --- user/pho/stress2/misc/recursiveflushes.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/recursiveflushes.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -61,9 +61,7 @@ for i in `jot 32`; do # Create 32 Mb files dd if=/dev/zero of=big.$i bs=16k count=2048 2>&1 | egrep -v "records|transferred"& done -for i in `jot 32`; do - wait -done +wait for i in `jot 32`; do rm -f big.$i done Modified: user/pho/stress2/misc/revoke.sh ============================================================================== --- user/pho/stress2/misc/revoke.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/revoke.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -46,9 +46,7 @@ for i in `jot $n`; do ./revoke /dev/ttyva > /dev/null 2>&1 & ./revoke /dev/ttyvb > /dev/null 2>&1 & ./revoke /dev/ttyvc > /dev/null 2>&1 & - for j in `jot 4`; do - wait - done + wait done rm -f revoke Modified: user/pho/stress2/misc/suj30.sh ============================================================================== --- user/pho/stress2/misc/suj30.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/suj30.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -54,9 +54,7 @@ chmod 777 $mntpoint for i in `jot 10`; do /tmp/suj30 $mntpoint/test-$i 100000 & done -for i in `jot 10`; do - wait -done +wait while mount | grep -q $mntpoint; do umount $mntpoint || sleep 1 Modified: user/pho/stress2/misc/tmpfs2.sh ============================================================================== --- user/pho/stress2/misc/tmpfs2.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/tmpfs2.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -43,10 +43,7 @@ if [ $# -eq 0 ]; then ./$0 $i & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait else if [ $1 = find ]; then Modified: user/pho/stress2/misc/umountf4.sh ============================================================================== --- user/pho/stress2/misc/umountf4.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/umountf4.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -57,10 +57,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$(( i + mdstart - 1 )) Modified: user/pho/stress2/misc/umountf6.sh ============================================================================== --- user/pho/stress2/misc/umountf6.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/umountf6.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -59,10 +59,7 @@ if [ $# -eq 0 ]; then ./$0 $m & ./$0 find & done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$((i + mdstart - 1)) Modified: user/pho/stress2/misc/vunref.sh ============================================================================== --- user/pho/stress2/misc/vunref.sh Sat Nov 28 09:34:45 2015 (r291421) +++ user/pho/stress2/misc/vunref.sh Sat Nov 28 09:42:52 2015 (r291422) @@ -74,10 +74,7 @@ if [ $# -eq 0 ]; then while [ ! -z "`ls $RUNDIR/active.* 2>/dev/null`" ] ; do ../testcases/swap/swap -t 2m -i 20 done - - for i in `jot $mounts`; do - wait; wait - done + wait for i in `jot $mounts`; do m=$((i + mdstart - 1)) From owner-svn-src-user@freebsd.org Sat Nov 28 09:50:54 2015 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 49751A3AD9B for ; Sat, 28 Nov 2015 09:50:54 +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 10E3D17AE; Sat, 28 Nov 2015 09:50:53 +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 tAS9or3v098080; Sat, 28 Nov 2015 09:50:53 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAS9orG5098079; Sat, 28 Nov 2015 09:50:53 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201511280950.tAS9orG5098079@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sat, 28 Nov 2015 09:50:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291423 - user/pho/stress2 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.20 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: Sat, 28 Nov 2015 09:50:54 -0000 Author: pho Date: Sat Nov 28 09:50:52 2015 New Revision: 291423 URL: https://svnweb.freebsd.org/changeset/base/291423 Log: Note that stress2/misc is the primary test directory. Move IPC cleanup. Sponsored by: EMC / Isilon storage division Modified: user/pho/stress2/run.sh Modified: user/pho/stress2/run.sh ============================================================================== --- user/pho/stress2/run.sh Sat Nov 28 09:42:52 2015 (r291422) +++ user/pho/stress2/run.sh Sat Nov 28 09:50:52 2015 (r291423) @@ -41,6 +41,8 @@ while getopts a name; do done shift $(($OPTIND - 1)) +pgrep -fq all.sh || + echo "Note: all.sh in stress2/misc is the preferred test to run." if [ ! -z "$aflag" ]; then . ./default.cfg export runRUNTIME=5m @@ -56,8 +58,6 @@ if [ ! -z "$aflag" ]; then printf "`date '+%Y%m%d %T'` run $i\r\n" > /dev/console $0 $i done - [ "`id -un`" = pho ] && ipcs | \ - awk '$5 ~/pho/ && $6 ~/pho/ {print "-" $1,$2}' | xargs ipcrm done else CONFIG=./default.cfg