Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Jan 2011 23:04:57 +0000 (UTC)
From:      Jilles Tjoelker <jilles@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r217864 - stable/8/tools/regression/usr.bin/sed
Message-ID:  <201101252304.p0PN4voO055651@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jilles
Date: Tue Jan 25 23:04:57 2011
New Revision: 217864
URL: http://svn.freebsd.org/changeset/base/217864

Log:
  MFC r217134: sed: Add test for r217863 (-i race).
  
  r217863 is the MFC of r217133.
  
  PR:		bin/153261

Added:
  stable/8/tools/regression/usr.bin/sed/inplace_race.t
     - copied unchanged from r217134, head/tools/regression/usr.bin/sed/inplace_race.t
Modified:
  stable/8/tools/regression/usr.bin/sed/Makefile
Directory Properties:
  stable/8/tools/regression/usr.bin/sed/   (props changed)

Modified: stable/8/tools/regression/usr.bin/sed/Makefile
==============================================================================
--- stable/8/tools/regression/usr.bin/sed/Makefile	Tue Jan 25 23:02:25 2011	(r217863)
+++ stable/8/tools/regression/usr.bin/sed/Makefile	Tue Jan 25 23:04:57 2011	(r217864)
@@ -3,3 +3,4 @@
 all:
 	@m4 ${.CURDIR}/../regress.m4 ${.CURDIR}/regress.sh | sh /dev/stdin ${.CURDIR}
 	@sh multitest.t
+	@sh inplace_race.t

Copied: stable/8/tools/regression/usr.bin/sed/inplace_race.t (from r217134, head/tools/regression/usr.bin/sed/inplace_race.t)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/tools/regression/usr.bin/sed/inplace_race.t	Tue Jan 25 23:04:57 2011	(r217864, copy of r217134, head/tools/regression/usr.bin/sed/inplace_race.t)
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+#-
+# Copyright (c) 2011 Jilles Tjoelker
+# 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$
+
+: "${SED=sed}"
+
+# This test really needs an SMP system. On an UP system, it will
+# usually pass even if the race condition exists.
+if command -v cpuset >/dev/null; then
+	case `cpuset -g -p $$` in
+	*,*) ;;
+	*)
+		echo '1..0 # Skipped: not an SMP system'
+		exit 0 ;;
+	esac
+fi
+
+echo "1..1"
+
+T=$(mktemp -d "${TMPDIR:-/tmp}/sed-test.XXXXXX")
+trap 'cd /; rm -rf "$T"' 0
+cd "$T"
+
+data=abababab
+data=$data$data$data$data
+data=$data$data$data$data
+data=$data$data$data$data
+data=$data$data$data$data
+data="BEGIN
+$data
+END"
+for i in 0 1 2 3 4 5 6 7 8 9; do
+	echo "$data" >file$i
+done
+len=${#data}
+
+i=0
+while [ $i -lt 100 ]; do
+	${SED} -i.prev "s/$i/ab/" file[0-9]
+	i=$((i+1))
+done &
+sedproc=$!
+
+while :; do
+	set -- file[0-9]
+	if [ $# -ne 10 ]; then
+		echo "not ok 1 inplace_race"
+		exit 3
+	fi
+done &
+checkproc=$!
+
+wait $sedproc
+kill $checkproc 2>/dev/null
+wait $checkproc >/dev/null 2>&1
+if [ $? -ne 3 ]; then
+	echo "ok 1 inplace_race"
+fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101252304.p0PN4voO055651>