ViewMTN: Diff from [d9d50979..] to [412d43c7..]

ViewMTN — No Description : Branches | Tags | Help | About | Change DB
Revision [d9d50979..]: Info | Browse Files | Download (tar)
The unified diff between revisions [d9d50979..] and [412d43c7..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_file "patches/convert-regress-games.diff"
#  content [b0957780a51c42829f0936d6baf0ea763ae17ee5]
#
# patch "patches/series"
#  from [6612654bfeb831d90d5f36d92c39fb86de64dcfb]
#    to [b8089dceae42864a6aa065317abd6b9503f5c2e0]
#
============================================================
--- patches/convert-regress-games.diff	b0957780a51c42829f0936d6baf0ea763ae17ee5
+++ patches/convert-regress-games.diff	b0957780a51c42829f0936d6baf0ea763ae17ee5
@@ -0,0 +1,205 @@
+Convert the regress/games tests to the atf
+
+This change converts all the existing regression tests in regress/games
+to the new framework provided by atf.  As a side effect, this also moves
+all the tests programs in regress/games to tests/games.
+Index: src/distrib/sets/lists/tests/mi
+===================================================================
+--- src.orig/distrib/sets/lists/tests/mi	2007-11-11 12:51:28.000000000 +0100
++++ src/distrib/sets/lists/tests/mi	2007-11-11 12:51:48.000000000 +0100
+@@ -251,6 +251,9 @@
+ ./usr/tests/fs/tmpfs/t_truncate			tests-fs-tests
+ ./usr/tests/fs/tmpfs/t_vnd			tests-fs-tests
+ ./usr/tests/fs/tmpfs/t_vnode_leak		tests-fs-tests
++./usr/tests/games				tests-games-tests
++./usr/tests/games/Atffile			tests-games-tests
++./usr/tests/games/t_factor			tests-games-tests
+ ./usr/tests/util				tests-util-tests
+ ./usr/tests/util/Atffile			tests-util-tests
+ ./usr/tests/util/df				tests-util-tests
+Index: src/etc/mtree/NetBSD.dist
+===================================================================
+--- src.orig/etc/mtree/NetBSD.dist	2007-11-11 12:51:28.000000000 +0100
++++ src/etc/mtree/NetBSD.dist	2007-11-11 12:51:48.000000000 +0100
+@@ -1090,6 +1090,7 @@
+ ./usr/tests/atf/units
+ ./usr/tests/fs
+ ./usr/tests/fs/tmpfs
++./usr/tests/games
+ ./usr/tests/util
+ ./usr/tests/util/df
+ ./usr/tests/util/ps
+Index: src/regress/Makefile
+===================================================================
+--- src.orig/regress/Makefile	2007-11-11 12:51:28.000000000 +0100
++++ src/regress/Makefile	2007-11-11 12:51:48.000000000 +0100
+@@ -1,6 +1,6 @@
+ #	$NetBSD: Makefile,v 1.13 2007/05/18 20:28:11 christos Exp $
+
+ # missing: libexec sbin usr.sbin share gnu
+-SUBDIR+= games include lib libexec sys usr.bin
++SUBDIR+= include lib libexec sys usr.bin
+
+ .include <bsd.subdir.mk>
+Index: src/regress/games/Makefile
+===================================================================
+--- src.orig/regress/games/Makefile	2007-11-11 12:51:28.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,5 +0,0 @@
+-#	$NetBSD: Makefile,v 1.1 2003/08/12 03:03:20 simonb Exp $
+-
+-SUBDIR+= factor
+-
+-.include <bsd.subdir.mk>
+Index: src/regress/games/factor/Makefile
+===================================================================
+--- src.orig/regress/games/factor/Makefile	2007-11-11 12:51:28.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,8 +0,0 @@
+-#	$NetBSD: Makefile,v 1.1 2003/08/12 03:03:20 simonb Exp $
+-
+-NOMAN=  	# defined
+-
+-regress:
+-	@ksh ${.CURDIR}/factor.sh
+-
+-.include <bsd.prog.mk>
+Index: src/regress/games/factor/factor.sh
+===================================================================
+--- src.orig/regress/games/factor/factor.sh	2007-11-11 12:51:28.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,25 +0,0 @@
+-#!/bin/ksh
+-
+-function test_factor {
+-	echo "Testing: \`/usr/games/factor $1\`"
+-	res=`/usr/games/factor $1 2>&1`
+-	if [ "$res" != "$2" ]; then
+-		echo "Expected \"$2\", got \"$res\" from factor: `eval echo $1`"
+-		exit 1
+-	fi
+-}
+-
+-# The first arg will get factor'd.
+-# The 2nd arg is an expected string/response from factor for that argument.
+-
+-# Test overflow cases
+-test_factor '8675309' '8675309: 8675309'
+-test_factor '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
+-
+-# Test algorithm bugs fixed by Joseph Myers from test cases from David A Bagley.
+-echo "Warning: the following test will loop endlessly with old factor program"
+-test_factor '99999999999991' '99999999999991: 7 13 769231 1428571'
+-echo "Warning: the following test will loop endlessly with old factor program"
+-test_factor '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
+-
+-exit 0
+Index: src/tests/Makefile
+===================================================================
+--- src.orig/tests/Makefile	2007-11-11 12:51:28.000000000 +0100
++++ src/tests/Makefile	2007-11-11 12:51:48.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ .include <bsd.own.mk>
+
+-SUBDIR=	atf fs util
++SUBDIR=	atf fs games util
+
+ .include <bsd.test.mk>
+ .include <bsd.subdir.mk>
+Index: src/tests/games/Atffile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/tests/games/Atffile	2007-11-11 12:51:48.000000000 +0100
+@@ -0,0 +1,5 @@
++Content-Type: application/X-atf-atffile; version="1"
++
++prop: test-suite = "NetBSD"
++
++tp-glob: *
+Index: src/tests/games/Makefile
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/tests/games/Makefile	2007-11-11 12:51:48.000000000 +0100
+@@ -0,0 +1,7 @@
++# $NetBSD$
++
++.include <bsd.own.mk>
++
++TESTS_SH=	t_factor
++
++.include <bsd.test.mk>
+Index: src/tests/games/t_factor.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ src/tests/games/t_factor.sh	2007-11-11 14:13:29.000000000 +0100
+@@ -0,0 +1,69 @@
++# $NetBSD$
++#
++# Copyright (c) 2007 The NetBSD Foundation, Inc.
++# 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.
++# 3. All advertising materials mentioning features or use of this software
++#    must display the following acknowledgement:
++#        This product includes software developed by the NetBSD
++#        Foundation, Inc. and its contributors.
++# 4. Neither the name of The NetBSD Foundation nor the names of its
++#    contributors may be used to endorse or promote products derived
++#    from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
++#
++
++expect() {
++	echo "${2}" >expout
++	atf_check "factor ${1}" 0 expout null
++}
++
++atf_test_case overflow
++overflow_head() {
++	atf_set "descr" "Tests for overflow conditions"
++	atf_set "require.progs" "factor"
++}
++overflow_body() {
++	expect '8675309' '8675309: 8675309'
++	expect '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
++}
++
++atf_test_case loop
++loop_head() {
++	atf_set "descr" "Tests some cases that once locked the program" \
++	                "in an infinite loop"
++	atf_set "require.progs" "factor"
++}
++loop_body() {
++	# XXX Remove this warning once ATF is able to delimit a test case's
++	# execution time, and properly enable this feature.
++	echo "WARNING: These tests will loop endlessly with an old factor" \
++	     "program"
++	expect '99999999999991' '99999999999991: 7 13 769231 1428571'
++	expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
++}
++
++atf_init_test_cases()
++{
++	atf_add_test_case overflow
++	atf_add_test_case loop
++}
============================================================
--- patches/series	6612654bfeb831d90d5f36d92c39fb86de64dcfb
+++ patches/series	b8089dceae42864a6aa065317abd6b9503f5c2e0
@@ -14,3 +14,4 @@ convert-regress-sys-fs-tmpfs.diff
 add-atf-tests.diff
 convert-regress-bin.diff
 convert-regress-sys-fs-tmpfs.diff
+convert-regress-games.diff