CVS commit: src/tests/util/awk
Module Name:src Committed By: jruoho Date: Sun Mar 11 18:38:18 UTC 2012 Removed Files: src/tests/util/awk: Makefile d_assign_NF.awk d_assign_NF.in d_assign_NF.out d_big_regexp.awk d_big_regexp.in d_big_regexp.out d_end1.awk d_end1.in d_end1.out d_end2.awk d_end2.in d_end2.out d_period.awk d_period.in d_period.out d_string1.awk d_string1.out d_tolower.awk d_tolower.in d_tolower.out d_toupper.awk d_toupper.in d_toupper.out t_awk.sh Log Message: Deprecate tests/util/awk. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/tests/util/awk/Makefile cvs rdiff -u -r1.1 -r0 src/tests/util/awk/d_assign_NF.awk \ src/tests/util/awk/d_assign_NF.in src/tests/util/awk/d_assign_NF.out \ src/tests/util/awk/d_big_regexp.awk src/tests/util/awk/d_big_regexp.in \ src/tests/util/awk/d_big_regexp.out src/tests/util/awk/d_end1.awk \ src/tests/util/awk/d_end1.in src/tests/util/awk/d_end1.out \ src/tests/util/awk/d_end2.awk src/tests/util/awk/d_end2.in \ src/tests/util/awk/d_end2.out src/tests/util/awk/d_period.awk \ src/tests/util/awk/d_period.in src/tests/util/awk/d_period.out \ src/tests/util/awk/d_string1.awk src/tests/util/awk/d_string1.out \ src/tests/util/awk/d_tolower.awk src/tests/util/awk/d_tolower.in \ src/tests/util/awk/d_tolower.out src/tests/util/awk/d_toupper.awk \ src/tests/util/awk/d_toupper.in src/tests/util/awk/d_toupper.out cvs rdiff -u -r1.7 -r0 src/tests/util/awk/t_awk.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/util
Module Name:src
Committed By: martin
Date: Sun Mar 11 22:19:53 UTC 2012
Modified Files:
src/tests/util: Makefile
Log Message:
Temporarily remove awk subdir, untill jruoho sorts out the recent commits
to the proper dir.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/util/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/Makefile
diff -u src/tests/util/Makefile:1.10 src/tests/util/Makefile:1.11
--- src/tests/util/Makefile:1.10 Sun Aug 1 16:42:58 2010
+++ src/tests/util/Makefile Sun Mar 11 22:19:53 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2010/08/01 16:42:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2012/03/11 22:19:53 martin Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util
-TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh sort \
+TESTS_SUBDIRS= bzip2 config cut df grep id m4 make mtree ps sdiff sh sort \
xlint
TESTS_SH= t_basename
CVS commit: src/tests/util/xlint/lint1
Module Name:src
Committed By: christos
Date: Sun Dec 25 20:16:05 UTC 2011
Modified Files:
src/tests/util/xlint/lint1: Makefile
Added Files:
src/tests/util/xlint/lint1: d_c99_decls_after_stmt2.c
d_typename_as_var.c
Log Message:
add 2 more tests, sort
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/xlint/lint1/d_c99_decls_after_stmt2.c \
src/tests/util/xlint/lint1/d_typename_as_var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/xlint/lint1/Makefile
diff -u src/tests/util/xlint/lint1/Makefile:1.2 src/tests/util/xlint/lint1/Makefile:1.3
--- src/tests/util/xlint/lint1/Makefile:1.2 Tue Oct 4 12:24:27 2011
+++ src/tests/util/xlint/lint1/Makefile Sun Dec 25 15:16:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/04 16:24:27 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/12/25 20:16:05 christos Exp $
NOMAN= # defined
@@ -9,8 +9,10 @@ TESTSDIR= ${TESTSBASE}/util/xlint/lint1
TESTS_SH= t_integration
FILESDIR= ${TESTSDIR}
-FILES= d_c99_complex_num.c
FILES+= d_alignof.c
+FILES+= d_c99_complex_num.c
+FILES+= d_c99_decls_after_stmt.c
+FILES+= d_c99_decls_after_stmt2.c
FILES+= d_c99_for_loops.c
FILES+= d_c99_func.c
FILES+= d_c99_recursive_init.c
@@ -20,7 +22,6 @@ FILES+= d_c99_union_init2.c
FILES+= d_c99_union_init3.c
FILES+= d_c9x_array_init.c
FILES+= d_c9x_recursive_init.c
-FILES+= d_c99_decls_after_stmt.c
FILES+= d_cast_init.c
FILES+= d_cast_init2.c
FILES+= d_cast_lhs.c
@@ -44,6 +45,7 @@ FILES+= d_shift_to_narrower_type.c
FILES+= d_type_conv1.c
FILES+= d_type_conv2.c
FILES+= d_type_conv3.c
+FILES+= d_typename_as_var.c
FILES+= d_zero_sized_arrays.c
.include bsd.test.mk
Added files:
Index: src/tests/util/xlint/lint1/d_c99_decls_after_stmt2.c
diff -u /dev/null src/tests/util/xlint/lint1/d_c99_decls_after_stmt2.c:1.1
--- /dev/null Sun Dec 25 15:16:05 2011
+++ src/tests/util/xlint/lint1/d_c99_decls_after_stmt2.c Sun Dec 25 15:16:05 2011
@@ -0,0 +1,6 @@
+typedef int int_t;
+int main(void) {
+int i = 0; i += 1;
+int_t j = 0; j += 1;
+return 0;
+}
Index: src/tests/util/xlint/lint1/d_typename_as_var.c
diff -u /dev/null src/tests/util/xlint/lint1/d_typename_as_var.c:1.1
--- /dev/null Sun Dec 25 15:16:05 2011
+++ src/tests/util/xlint/lint1/d_typename_as_var.c Sun Dec 25 15:16:05 2011
@@ -0,0 +1,14 @@
+typedef char h[10];
+
+typedef struct {
+ int i;
+ char *c;
+} fh;
+
+struct foo {
+ fh h;
+ struct {
+ int x;
+ int y;
+ } fl;
+};
CVS commit: src/tests/util/sh
Module Name:src
Committed By: christos
Date: Mon Nov 14 20:23:29 UTC 2011
Modified Files:
src/tests/util/sh: Makefile
Added Files:
src/tests/util/sh: t_evaltested.sh
Log Message:
Add a test for PR/45613 (eval failing in a tested context)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/sh/t_evaltested.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/Makefile
diff -u src/tests/util/sh/Makefile:1.3 src/tests/util/sh/Makefile:1.4
--- src/tests/util/sh/Makefile:1.3 Tue Oct 20 17:58:35 2009
+++ src/tests/util/sh/Makefile Mon Nov 14 15:23:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/10/20 21:58:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2011/11/14 20:23:29 christos Exp $
.include bsd.own.mk
@@ -7,6 +7,7 @@ TESTSDIR= ${TESTSBASE}/util/sh
TESTS_SH= t_compexit
TESTS_SH+= t_exit
TESTS_SH+= t_expand
+TESTS_SH+= t_evaltested
TESTS_SH+= t_fsplit
TESTS_SH+= t_here
TESTS_SH+= t_set_e
Added files:
Index: src/tests/util/sh/t_evaltested.sh
diff -u /dev/null src/tests/util/sh/t_evaltested.sh:1.1
--- /dev/null Mon Nov 14 15:23:29 2011
+++ src/tests/util/sh/t_evaltested.sh Mon Nov 14 15:23:29 2011
@@ -0,0 +1,67 @@
+# $NetBSD: t_evaltested.sh,v 1.1 2011/11/14 20:23:29 christos Exp $
+#
+# Copyright (c) 2011 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.
+#
+
+atf_test_case evaltested
+
+evaltested_head() {
+ atf_set descr Tests that eval in a tested context does not exit
+}
+
+evaltested_body() {
+ set -e
+cat helper.sh EOF
+set -e
+if eval false
+then
+ echo 'eval false' returned true
+ exit 1
+fi
+echo passed
+exit 0
+EOF
+ output=$(/bin/sh helper.sh)
+ [ $? = 0 ] return
+
+ if [ -n $output ]
+ then
+ atf_fail $output
+ else
+ atf_fail 'eval false' exited from a tested context
+ fi
+
+}
+
+atf_init_test_cases() {
+ atf_add_test_case evaltested
+}
CVS commit: src/tests/util/sh
Module Name:src Committed By: christos Date: Mon Nov 14 20:47:33 UTC 2011 Modified Files: src/tests/util/sh: t_evaltested.sh Log Message: remove c3 and c4 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/util/sh/t_evaltested.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/sh/t_evaltested.sh diff -u src/tests/util/sh/t_evaltested.sh:1.1 src/tests/util/sh/t_evaltested.sh:1.2 --- src/tests/util/sh/t_evaltested.sh:1.1 Mon Nov 14 15:23:29 2011 +++ src/tests/util/sh/t_evaltested.sh Mon Nov 14 15:47:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_evaltested.sh,v 1.1 2011/11/14 20:23:29 christos Exp $ +# $NetBSD: t_evaltested.sh,v 1.2 2011/11/14 20:47:33 christos Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -11,13 +11,6 @@ # 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
CVS commit: src/tests/util/xlint/lint1
Module Name:src
Committed By: njoly
Date: Wed Oct 5 21:30:50 UTC 2011
Modified Files:
src/tests/util/xlint/lint1: d_c99_decls_after_stmt.c
Log Message:
Fix lint unrelated set but not used warning, to unbreak test.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c
diff -u src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c:1.1 src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c:1.2
--- src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c:1.1 Tue Oct 4 16:24:27 2011
+++ src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c Wed Oct 5 21:30:50 2011
@@ -1,5 +1,5 @@
void sample(void)
{
int i = 0; i += 1;
- int j = 0; i += 1;
+ int j = 0; j += 1;
}
CVS commit: src/tests/util/xlint/lint1
Module Name:src
Committed By: christos
Date: Tue Oct 4 16:24:27 UTC 2011
Modified Files:
src/tests/util/xlint/lint1: Makefile t_integration.sh
Added Files:
src/tests/util/xlint/lint1: d_c99_decls_after_stmt.c
Log Message:
Add new test.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c
cvs rdiff -u -r1.2 -r1.3 src/tests/util/xlint/lint1/t_integration.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/xlint/lint1/Makefile
diff -u src/tests/util/xlint/lint1/Makefile:1.1 src/tests/util/xlint/lint1/Makefile:1.2
--- src/tests/util/xlint/lint1/Makefile:1.1 Sun Jul 18 06:11:01 2010
+++ src/tests/util/xlint/lint1/Makefile Tue Oct 4 12:24:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 10:11:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2011/10/04 16:24:27 christos Exp $
NOMAN= # defined
@@ -20,6 +20,7 @@ FILES+= d_c99_union_init2.c
FILES+= d_c99_union_init3.c
FILES+= d_c9x_array_init.c
FILES+= d_c9x_recursive_init.c
+FILES+= d_c99_decls_after_stmt.c
FILES+= d_cast_init.c
FILES+= d_cast_init2.c
FILES+= d_cast_lhs.c
Index: src/tests/util/xlint/lint1/t_integration.sh
diff -u src/tests/util/xlint/lint1/t_integration.sh:1.2 src/tests/util/xlint/lint1/t_integration.sh:1.3
--- src/tests/util/xlint/lint1/t_integration.sh:1.2 Fri Mar 25 15:19:46 2011
+++ src/tests/util/xlint/lint1/t_integration.sh Tue Oct 4 12:24:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.2 2011/03/25 19:19:46 njoly Exp $
+# $NetBSD: t_integration.sh,v 1.3 2011/10/04 16:24:27 christos Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -81,6 +81,7 @@ test_case check_valid c99_func Checks C
test_case check_valid gcc_variable_array_init Checks GCC variable array \
initializers
test_case check_valid c9x_array_init Checks C9X array initializers
+test_case check_valid c99_decls_after_stmt Checks C99 decls after statements
test_case check_valid nolimit_init Checks no limit initializers
test_case check_valid zero_sized_arrays Checks zero sized arrays
Added files:
Index: src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c
diff -u /dev/null src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c:1.1
--- /dev/null Tue Oct 4 12:24:27 2011
+++ src/tests/util/xlint/lint1/d_c99_decls_after_stmt.c Tue Oct 4 12:24:27 2011
@@ -0,0 +1,5 @@
+void sample(void)
+{
+ int i = 0; i += 1;
+ int j = 0; i += 1;
+}
CVS commit: src/tests/util/df
Module Name:src
Committed By: gson
Date: Mon Aug 29 17:31:41 UTC 2011
Modified Files:
src/tests/util/df: t_df.sh
Log Message:
Track spacing changes of df.c 1.89
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/util/df/t_df.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/t_df.sh
diff -u src/tests/util/df/t_df.sh:1.9 src/tests/util/df/t_df.sh:1.10
--- src/tests/util/df/t_df.sh:1.9 Mon Aug 29 04:55:58 2011
+++ src/tests/util/df/t_df.sh Mon Aug 29 17:31:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.9 2011/08/29 04:55:58 gson Exp $
+# $NetBSD: t_df.sh,v 1.10 2011/08/29 17:31:41 gson Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -91,51 +91,51 @@
}
hflag_body() {
cat expout EOF
-FilesystemSize Used Avail %Cap Mounted on
-filer:/ 1.1T 132M 1.1T 0% /filer
-filer:/ 1.1T 0B 1.1T 0% /filer
-filer:/ 1.1T 229G 918G 20% /filer
-filer:/ 1.1T 688G 459G 60% /filer
-filer:/ 1.1T 1.1T57G 95% /filer
-filer:/ 1.1T 1.1T 0B 100% /filer
-filer:/ 1.1T 0B 1.1T 0% /filer
-filer:/ 1.1T 229G 860G 21% /filer
-filer:/ 1.1T 688G 401G 63% /filer
-filer:/ 1.1T 1.1T 0B 100% /filer
-filer:/ 1.1T 1.1T -57G 105% /filer
-filer:/ 1.1T 0B 1.0T 0% /filer
-filer:/ 1.1T 229G 803G 22% /filer
-filer:/ 1.1T 688G 344G 66% /filer
-filer:/ 1.1T 1.1T -57G 105% /filer
-filer:/ 1.1T 1.1T -115G 111% /filer
-filer:/ 1.1T 0B 975G 0% /filer
-filer:/ 1.1T 229G 746G 23% /filer
-filer:/ 1.1T 688G 287G 70% /filer
-filer:/ 1.1T 1.1T -115G 111% /filer
-filer:/ 1.1T 1.1T -172G 117% /filer
-/dev/ld0g 1.2T17G 1.1T 1% /anon-root
-/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
-/dev/ld0g 1.2T 250G 998G 20% /anon-root
-/dev/ld0g 1.2T 749G 499G 60% /anon-root
-/dev/ld0g 1.2T 1.2T62G 95% /anon-root
-/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
-/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
-/dev/ld0g 1.2T 250G 936G 21% /anon-root
-/dev/ld0g 1.2T 749G 437G 63% /anon-root
-/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
-/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
-/dev/ld0g 1.2T 0B 1.1T 0% /anon-root
-/dev/ld0g 1.2T 250G 874G 22% /anon-root
-/dev/ld0g 1.2T 749G 374G 66% /anon-root
-/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
-/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
-/dev/ld0g 1.2T 0B 1.0T 0% /anon-root
-/dev/ld0g 1.2T 250G 811G 23% /anon-root
-/dev/ld0g 1.2T 749G 312G 70% /anon-root
-/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
-/dev/ld0g 1.2T 1.2T -187G 117% /anon-root
-/dev/strpct20T10T10T 50% /strpct
-/dev/wd0e 10G 2.7G 7.3G 27% /mount/windows/C
+Filesystem Size Used Avail %Cap Mounted on
+filer:/1.1T 132M 1.1T 0% /filer
+filer:/1.1T 0B 1.1T 0% /filer
+filer:/1.1T 229G 918G 20% /filer
+filer:/1.1T 688G 459G 60% /filer
+filer:/1.1T 1.1T57G 95% /filer
+filer:/1.1T 1.1T 0B 100% /filer
+filer:/1.1T 0B 1.1T 0% /filer
+filer:/1.1T 229G 860G 21% /filer
+filer:/1.1T 688G 401G 63% /filer
+filer:/1.1T 1.1T 0B 100% /filer
+filer:/1.1T 1.1T -57G 105% /filer
+filer:/1.1T 0B 1.0T 0% /filer
+filer:/1.1T 229G 803G 22% /filer
+filer:/1.1T 688G 344G 66% /filer
+filer:/1.1T 1.1T -57G 105% /filer
+filer:/1.1T 1.1T -115G 111% /filer
+filer:/1.1T 0B 975G 0% /filer
+filer:/1.1T 229G 746G 23% /filer
+filer:/1.1T 688G 287G 70% /filer
+filer:/1.1T 1.1T -115G 111% /filer
+filer:/1.1T 1.1T -172G 117% /filer
+/dev/ld0g 1.2T17G 1.1T 1% /anon-root
+/dev/ld0g 1.2T
CVS commit: src/tests/util/df
Module Name:src
Committed By: mbalmer
Date: Sun Aug 28 09:02:51 UTC 2011
Modified Files:
src/tests/util/df: Makefile
Log Message:
Fix build (strcpt fallout).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/df/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/Makefile
diff -u src/tests/util/df/Makefile:1.3 src/tests/util/df/Makefile:1.4
--- src/tests/util/df/Makefile:1.3 Wed Aug 17 17:08:59 2011
+++ src/tests/util/df/Makefile Sun Aug 28 09:02:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/08/17 17:08:59 christos Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/28 09:02:51 mbalmer Exp $
NOMAN= # defined
@@ -11,8 +11,10 @@
BINDIR= ${TESTSDIR}
PROG= h_df
.PATH: ${NETBSDSRCDIR}/bin/df
-.PATH: ${NETBSDSRCDIR}/bin/csh
-SRCS= df.c strpct.c getmntinfo.c
+SRCS= df.c getmntinfo.c
+
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
# Pass -DINTREE to make to test using humanize_number.c in source tree
# directly instead of the one in libc.
CVS commit: src/tests/util/df
Module Name:src Committed By: christos Date: Sun Aug 28 09:39:44 UTC 2011 Modified Files: src/tests/util/df: Makefile Log Message: remove strpct copts To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/util/df/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/df/Makefile diff -u src/tests/util/df/Makefile:1.4 src/tests/util/df/Makefile:1.5 --- src/tests/util/df/Makefile:1.4 Sun Aug 28 05:02:51 2011 +++ src/tests/util/df/Makefile Sun Aug 28 05:39:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/08/28 09:02:51 mbalmer Exp $ +# $NetBSD: Makefile,v 1.5 2011/08/28 09:39:44 christos Exp $ NOMAN= # defined @@ -24,6 +24,4 @@ SRCS+= humanize_number.c .endif -COPTS.strpct.c += -Wno-format-nonliteral - .include bsd.test.mk
CVS commit: src/tests/util/df
Module Name:src
Committed By: gson
Date: Sun Aug 28 19:09:34 UTC 2011
Modified Files:
src/tests/util/df: t_df.sh
Log Message:
Golden output was not so golden after all
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/util/df/t_df.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/t_df.sh
diff -u src/tests/util/df/t_df.sh:1.7 src/tests/util/df/t_df.sh:1.8
--- src/tests/util/df/t_df.sh:1.7 Sun Nov 7 17:51:23 2010
+++ src/tests/util/df/t_df.sh Sun Aug 28 19:09:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.7 2010/11/07 17:51:23 jmmv Exp $
+# $NetBSD: t_df.sh,v 1.8 2011/08/28 19:09:34 gson Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,7 +33,7 @@
}
normal_body() {
cat expout EOF
-Filesystem 1K-blocks Used Avail %Cap Mounted on
+Filesystem 1K-blocks Used Avail %Cap Mounted on
filer:/ 1202716672 135168 1202581504 0% /filer
filer:/ 1202716672 0 1202716672 0% /filer
filer:/ 1202716672 240543334 962173337 20% /filer
CVS commit: src/tests/util/df
Module Name:src
Committed By: gson
Date: Mon Aug 29 04:55:58 UTC 2011
Modified Files:
src/tests/util/df: t_df.sh
Log Message:
Fix remaining misaligned columns in golden output, missed in previous commit
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/util/df/t_df.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/t_df.sh
diff -u src/tests/util/df/t_df.sh:1.8 src/tests/util/df/t_df.sh:1.9
--- src/tests/util/df/t_df.sh:1.8 Sun Aug 28 19:09:34 2011
+++ src/tests/util/df/t_df.sh Mon Aug 29 04:55:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.8 2011/08/28 19:09:34 gson Exp $
+# $NetBSD: t_df.sh,v 1.9 2011/08/29 04:55:58 gson Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,7 +33,7 @@
}
normal_body() {
cat expout EOF
-Filesystem 1K-blocks Used Avail %Cap Mounted on
+Filesystem1K-blocks Used Avail %Cap Mounted on
filer:/ 1202716672 135168 1202581504 0% /filer
filer:/ 1202716672 0 1202716672 0% /filer
filer:/ 1202716672 240543334 962173337 20% /filer
CVS commit: src/tests/util
Module Name:src
Committed By: christos
Date: Wed Aug 17 17:08:59 UTC 2011
Modified Files:
src/tests/util/df: Makefile
src/tests/util/id: Makefile
Log Message:
document non-literal format strings
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/df/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/util/id/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/Makefile
diff -u src/tests/util/df/Makefile:1.2 src/tests/util/df/Makefile:1.3
--- src/tests/util/df/Makefile:1.2 Wed Nov 21 10:39:34 2007
+++ src/tests/util/df/Makefile Wed Aug 17 13:08:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/11/21 15:39:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/17 17:08:59 christos Exp $
NOMAN= # defined
@@ -22,4 +22,6 @@
SRCS+= humanize_number.c
.endif
+COPTS.strpct.c += -Wno-format-nonliteral
+
.include bsd.test.mk
Index: src/tests/util/id/Makefile
diff -u src/tests/util/id/Makefile:1.4 src/tests/util/id/Makefile:1.5
--- src/tests/util/id/Makefile:1.4 Tue Jul 13 17:13:32 2010
+++ src/tests/util/id/Makefile Wed Aug 17 13:08:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/17 17:08:59 christos Exp $
NOMAN= # defined
@@ -15,4 +15,6 @@
.PATH: ${NETBSDSRCDIR}/usr.bin/id
SRCS= id.c pwgr.c
+COPTS.id.c += -Wno-format-nonliteral
+
.include bsd.test.mk
CVS commit: src/tests/util/sort
Module Name:src
Committed By: jmmv
Date: Wed Jun 15 07:58:03 UTC 2011
Modified Files:
src/tests/util/sort: t_sort.sh
Log Message:
Fix definition of the plus_tflag test case. Uncovered by atf 0.14.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/sort/t_sort.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sort/t_sort.sh
diff -u src/tests/util/sort/t_sort.sh:1.3 src/tests/util/sort/t_sort.sh:1.4
--- src/tests/util/sort/t_sort.sh:1.3 Sat Dec 18 12:47:21 2010
+++ src/tests/util/sort/t_sort.sh Wed Jun 15 07:58:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_sort.sh,v 1.3 2010/12/18 12:47:21 pooka Exp $
+# $NetBSD: t_sort.sh,v 1.4 2011/06/15 07:58:03 jmmv Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -938,12 +938,12 @@
}
atf_test_case plus_tflag
-plus_tflag()
+plus_tflag_head()
{
atf_set descr Tests +- addressing: using -T caused a 'No such file \
or directory' error
}
-plus_tflag()
+plus_tflag_body()
{
mkdir ./+
yes | sed 20q | sort -T + /dev/null || atf_fail program failed
CVS commit: src/tests/util/awk
Module Name:src
Committed By: jruoho
Date: Mon May 2 08:30:21 UTC 2011
Modified Files:
src/tests/util/awk: t_awk.sh
Log Message:
Use the standard PR foo/1234 notation such that the PR number is parsed
correctly for the atf(7) HTML reports.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/util/awk/t_awk.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/awk/t_awk.sh
diff -u src/tests/util/awk/t_awk.sh:1.5 src/tests/util/awk/t_awk.sh:1.6
--- src/tests/util/awk/t_awk.sh:1.5 Sat Apr 30 01:10:07 2011
+++ src/tests/util/awk/t_awk.sh Mon May 2 08:30:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.5 2011/04/30 01:10:07 alnsn Exp $
+# $NetBSD: t_awk.sh,v 1.6 2011/05/02 08:30:21 jruoho Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -94,7 +94,7 @@
{
export LANG=ru_RU.KOI8-R
- atf_expect_fail PR/42320
+ atf_expect_fail PR bin/42320
h_check period -v x=0.5
}
CVS commit: src/tests/util/awk
Module Name:src Committed By: alnsn Date: Sat Apr 30 11:24:14 UTC 2011 Modified Files: src/tests/util/awk: Makefile Log Message: Add new files. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/util/awk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/awk/Makefile diff -u src/tests/util/awk/Makefile:1.1 src/tests/util/awk/Makefile:1.2 --- src/tests/util/awk/Makefile:1.1 Fri Feb 13 05:19:51 2009 +++ src/tests/util/awk/Makefile Sat Apr 30 11:24:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2011/04/30 11:24:14 alnsn Exp $ NOMAN= # defined @@ -18,6 +18,9 @@ FILES+= d_end2.awk FILES+= d_end2.in FILES+= d_end2.out +FILES+= d_period.awk +FILES+= d_period.in +FILES+= d_period.out FILES+= d_string1.awk FILES+= d_string1.out FILES+= d_tolower.awk
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Fri Apr 29 12:49:36 UTC 2011
Modified Files:
src/tests/util/sh: t_exit.sh
Log Message:
Add test cases for PR bin/6764: 'trap ... 0' is supposed to execute the
command when the shell exits but it does not work in ksh when the shells
exits implicitly (without an explicit exit/return statement).
These new tests cover both sh and ksh. The ksh part of this does not
strictly belong to this directory, but I think it'd be nice to extend
all the tests in here to cover both interpreters whenever that makes
sense, much like we do with the file system tests.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/sh/t_exit.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_exit.sh
diff -u src/tests/util/sh/t_exit.sh:1.1 src/tests/util/sh/t_exit.sh:1.2
--- src/tests/util/sh/t_exit.sh:1.1 Tue Oct 20 21:58:35 2009
+++ src/tests/util/sh/t_exit.sh Fri Apr 29 12:49:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_exit.sh,v 1.1 2009/10/20 21:58:35 jmmv Exp $
+# $NetBSD: t_exit.sh,v 1.2 2011/04/29 12:49:36 jmmv Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,8 +62,33 @@
'( trap echo exiting EXIT; /usr/bin/true )'
}
+atf_test_case trap_zero__implicit_exit
+trap_zero__implicit_exit_body() {
+ echo '( trap echo exiting 0 )' helper.sh
+ atf_check -s eq:0 -o match:exiting -e empty /bin/sh helper.sh
+ atf_expect_fail PR bin/6764: sh works but ksh does not
+ atf_check -s eq:0 -o match:exiting -e empty /bin/ksh helper.sh
+}
+
+atf_test_case trap_zero__explicit_exit
+trap_zero__explicit_exit_body() {
+ echo '( trap echo exiting 0; exit )' helper.sh
+ atf_check -s eq:0 -o match:exiting -e empty /bin/sh helper.sh
+ atf_check -s eq:0 -o match:exiting -e empty /bin/ksh helper.sh
+}
+
+atf_test_case trap_zero__explicit_return
+trap_zero__explicit_return_body() {
+ echo '( trap echo exiting 0; return )' helper.sh
+ atf_check -s eq:0 -o match:exiting -e empty /bin/sh helper.sh
+ atf_check -s eq:0 -o match:exiting -e empty /bin/ksh helper.sh
+}
+
atf_init_test_cases() {
atf_add_test_case function
atf_add_test_case readout
atf_add_test_case trap_subshell
+ atf_add_test_case trap_zero__implicit_exit
+ atf_add_test_case trap_zero__explicit_exit
+ atf_add_test_case trap_zero__explicit_return
}
CVS commit: src/tests/util/awk
Module Name:src
Committed By: alnsn
Date: Sat Apr 30 01:10:08 UTC 2011
Modified Files:
src/tests/util/awk: t_awk.sh
Log Message:
PR/42320 doesn't seem to be fixed, mark the failure as expected.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/util/awk/t_awk.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/awk/t_awk.sh
diff -u src/tests/util/awk/t_awk.sh:1.4 src/tests/util/awk/t_awk.sh:1.5
--- src/tests/util/awk/t_awk.sh:1.4 Thu Apr 28 23:28:23 2011
+++ src/tests/util/awk/t_awk.sh Sat Apr 30 01:10:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.4 2011/04/28 23:28:23 alnsn Exp $
+# $NetBSD: t_awk.sh,v 1.5 2011/04/30 01:10:07 alnsn Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -94,6 +94,7 @@
{
export LANG=ru_RU.KOI8-R
+ atf_expect_fail PR/42320
h_check period -v x=0.5
}
CVS commit: src/tests/util/awk
Module Name:src
Committed By: alnsn
Date: Thu Apr 28 23:28:23 UTC 2011
Modified Files:
src/tests/util/awk: t_awk.sh
Added Files:
src/tests/util/awk: d_period.awk d_period.in d_period.out
Log Message:
Test for PR bin/42320.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/util/awk/d_period.awk \
src/tests/util/awk/d_period.in src/tests/util/awk/d_period.out
cvs rdiff -u -r1.3 -r1.4 src/tests/util/awk/t_awk.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/awk/t_awk.sh
diff -u src/tests/util/awk/t_awk.sh:1.3 src/tests/util/awk/t_awk.sh:1.4
--- src/tests/util/awk/t_awk.sh:1.3 Sun Nov 7 17:51:22 2010
+++ src/tests/util/awk/t_awk.sh Thu Apr 28 23:28:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.3 2010/11/07 17:51:22 jmmv Exp $
+# $NetBSD: t_awk.sh,v 1.4 2011/04/28 23:28:23 alnsn Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -27,10 +27,12 @@
h_check()
{
+ local fname=d_$1
for sfx in in out awk; do
- cp -r $(atf_get_srcdir)/d_$1.$sfx .
+ cp -r $(atf_get_srcdir)/$fname.$sfx .
done
- atf_check -o file:d_$1.out -x awk -f d_$1.awk d_$1.in
+ shift 1
+ atf_check -o file:$fname.out -x awk $@ -f $fname.awk $fname.in
}
atf_test_case big_regexp
@@ -82,10 +84,24 @@
h_check toupper
}
+atf_test_case period
+period_head()
+{
+ atf_set descr Checks that the period character is recognised \
+ in awk program regardless of locale (bin/42320)
+}
+period_body()
+{
+ export LANG=ru_RU.KOI8-R
+
+ h_check period -v x=0.5
+}
+
atf_init_test_cases()
{
atf_add_test_case big_regexp
atf_add_test_case end
atf_add_test_case string1
atf_add_test_case multibyte
+ atf_add_test_case period
}
Added files:
Index: src/tests/util/awk/d_period.awk
diff -u /dev/null src/tests/util/awk/d_period.awk:1.1
--- /dev/null Thu Apr 28 23:28:23 2011
+++ src/tests/util/awk/d_period.awk Thu Apr 28 23:28:23 2011
@@ -0,0 +1 @@
+{print x + $1 + 0.125}
Index: src/tests/util/awk/d_period.in
diff -u /dev/null src/tests/util/awk/d_period.in:1.1
--- /dev/null Thu Apr 28 23:28:23 2011
+++ src/tests/util/awk/d_period.in Thu Apr 28 23:28:23 2011
@@ -0,0 +1 @@
+0,25
Index: src/tests/util/awk/d_period.out
diff -u /dev/null src/tests/util/awk/d_period.out:1.1
--- /dev/null Thu Apr 28 23:28:23 2011
+++ src/tests/util/awk/d_period.out Thu Apr 28 23:28:23 2011
@@ -0,0 +1 @@
+0,875
CVS commit: src/tests/util/mtree
Module Name:src
Committed By: uebayasi
Date: Sun Feb 13 12:47:27 UTC 2011
Modified Files:
src/tests/util/mtree: t_mtree.sh
Log Message:
Typo.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/util/mtree/t_mtree.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/mtree/t_mtree.sh
diff -u src/tests/util/mtree/t_mtree.sh:1.6 src/tests/util/mtree/t_mtree.sh:1.7
--- src/tests/util/mtree/t_mtree.sh:1.6 Sun Nov 7 17:51:24 2010
+++ src/tests/util/mtree/t_mtree.sh Sun Feb 13 12:47:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtree.sh,v 1.6 2010/11/07 17:51:24 jmmv Exp $
+# $NetBSD: t_mtree.sh,v 1.7 2011/02/13 12:47:27 uebayasi Exp $
#
# Copyright (c) 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,7 +25,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# Postprocess mtreee output, canonicalising portions that
+# Postprocess mtree output, canonicalising portions that
# are expected to differ from one run to another.
h_postprocess()
{
CVS commit: src/tests/util/make
Module Name:src Committed By: pgoyette Date: Sun Jan 2 04:41:24 UTC 2011 Modified Files: src/tests/util/make: d_unmatchedvarparen.out Log Message: The unmatchedvarparens test actually generates a blank link as output, so make sure we have a matching blank line in the golden output match file. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/util/make/d_unmatchedvarparen.out Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/make/d_unmatchedvarparen.out diff -u src/tests/util/make/d_unmatchedvarparen.out:1.1 src/tests/util/make/d_unmatchedvarparen.out:1.2 --- src/tests/util/make/d_unmatchedvarparen.out:1.1 Fri Dec 3 01:29:55 2010 +++ src/tests/util/make/d_unmatchedvarparen.out Sun Jan 2 04:41:24 2011 @@ -0,0 +1 @@ +
CVS commit: src/tests/util/make
Module Name:src Committed By: pgoyette Date: Fri Dec 31 14:55:08 UTC 2010 Modified Files: src/tests/util/make: t_make.sh Log Message: Correct a typo that creept in 4 weeks ago. This removes the 1 Bogus Test currently being reported. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/util/make/t_make.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/make/t_make.sh diff -u src/tests/util/make/t_make.sh:1.3 src/tests/util/make/t_make.sh:1.4 --- src/tests/util/make/t_make.sh:1.3 Fri Dec 3 01:29:55 2010 +++ src/tests/util/make/t_make.sh Fri Dec 31 14:55:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_make.sh,v 1.3 2010/12/03 01:29:55 christos Exp $ +# $NetBSD: t_make.sh,v 1.4 2010/12/31 14:55:07 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -85,5 +85,5 @@ atf_add_test_case qequals atf_add_test_case ternary atf_add_test_case varcmd - atf_add_test_case unmathedvarparen + atf_add_test_case unmatchedvarparen }
CVS commit: src/tests/util
Module Name:src
Committed By: pooka
Date: Mon Dec 6 15:54:00 UTC 2010
Modified Files:
src/tests/util: t_dd.sh
Log Message:
test for 'dd seek=' (could be improved, but at least we have something now)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/t_dd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/t_dd.sh
diff -u src/tests/util/t_dd.sh:1.2 src/tests/util/t_dd.sh:1.3
--- src/tests/util/t_dd.sh:1.2 Wed Apr 30 13:11:00 2008
+++ src/tests/util/t_dd.sh Mon Dec 6 15:54:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_dd.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_dd.sh,v 1.3 2010/12/06 15:54:00 pooka Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -101,8 +101,26 @@
$allvisbits $ebcdicvisbits
}
+atf_test_case seek
+seek_head() {
+ atf_set descr Tests output file seeking
+}
+
+seek_body() {
+ echo TEST1234 testfile
+ atf_check -s exit:0 -e ignore \
+ dd if=/dev/zero of=testfile seek=1 bs=8k count=1
+ atf_check -s exit:0 -e ignore -o match:'^TEST1234$' dd if=testfile
+
+ echo TEST1234 tf2
+ atf_check -s exit:0 -e ignore -x \
+ 'dd bs=4 if=/dev/zero count=1 | tr \\0 \\n | dd of=tf2 bs=4 seek=1'
+ atf_check -s exit:0 -e ignore -o match:'^TEST$' dd if=tf2
+}
+
atf_init_test_cases()
{
atf_add_test_case length
atf_add_test_case io
+ atf_add_test_case seek
}
CVS commit: src/tests/util
Module Name:src Committed By: pooka Date: Mon Dec 6 16:43:26 UTC 2010 Modified Files: src/tests/util: t_dd.sh Log Message: In the seek test also check that files end up with expected size. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/util/t_dd.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/t_dd.sh diff -u src/tests/util/t_dd.sh:1.3 src/tests/util/t_dd.sh:1.4 --- src/tests/util/t_dd.sh:1.3 Mon Dec 6 15:54:00 2010 +++ src/tests/util/t_dd.sh Mon Dec 6 16:43:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_dd.sh,v 1.3 2010/12/06 15:54:00 pooka Exp $ +# $NetBSD: t_dd.sh,v 1.4 2010/12/06 16:43:26 pooka Exp $ # # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. @@ -111,11 +111,15 @@ atf_check -s exit:0 -e ignore \ dd if=/dev/zero of=testfile seek=1 bs=8k count=1 atf_check -s exit:0 -e ignore -o match:'^TEST1234$' dd if=testfile + eval $(stat -s testfile) + atf_check_equal $st_size $((2*8192)) - echo TEST1234 tf2 + echo -n TEST1234 tf2 atf_check -s exit:0 -e ignore -x \ 'dd bs=4 if=/dev/zero count=1 | tr \\0 \\n | dd of=tf2 bs=4 seek=1' atf_check -s exit:0 -e ignore -o match:'^TEST$' dd if=tf2 + eval $(stat -s tf2) + atf_check_equal $st_size 8 } atf_init_test_cases()
CVS commit: src/tests/util/make
Module Name:src
Committed By: christos
Date: Fri Dec 3 01:29:55 UTC 2010
Modified Files:
src/tests/util/make: Makefile t_make.sh
Added Files:
src/tests/util/make: d_unmatchedvarparen.mk d_unmatchedvarparen.out
Log Message:
Add a new test for the latest variable expansion problem.
- Cannot test because make test prints:
.: Can't open /usr/share/atf/atf.header.subr
- The shell script common code needs to be fixed to follow regular shell
style.
- variables are underquoted
- uses `` instead of $()
- does not use local for local variables, prefixes with undescore
- needlessly uses braces for numeric and symbolic variables.
- uses a fifo to grab output, and does not clean it up properly on error
- should not exit with 127 !!!
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/make/Makefile \
src/tests/util/make/t_make.sh
cvs rdiff -u -r0 -r1.1 src/tests/util/make/d_unmatchedvarparen.mk \
src/tests/util/make/d_unmatchedvarparen.out
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/make/Makefile
diff -u src/tests/util/make/Makefile:1.2 src/tests/util/make/Makefile:1.3
--- src/tests/util/make/Makefile:1.2 Sat Jul 10 12:16:12 2010
+++ src/tests/util/make/Makefile Thu Dec 2 20:29:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/10 16:16:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/12/03 01:29:55 christos Exp $
NOMAN= # defined
@@ -37,6 +37,8 @@
FILES+= d_qequals.out
FILES+= d_ternary.mk
FILES+= d_ternary.out
+FILES+= d_unmatchedvarparen.mk
+FILES+= d_unmatchedvarparen.out
FILES+= d_varcmd.mk
FILES+= d_varcmd.out
Index: src/tests/util/make/t_make.sh
diff -u src/tests/util/make/t_make.sh:1.2 src/tests/util/make/t_make.sh:1.3
--- src/tests/util/make/t_make.sh:1.2 Sun Nov 7 12:51:23 2010
+++ src/tests/util/make/t_make.sh Thu Dec 2 20:29:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.2 2010/11/07 17:51:23 jmmv Exp $
+# $NetBSD: t_make.sh,v 1.3 2010/12/03 01:29:55 christos Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -66,6 +66,7 @@
test_case qequals Checks operator ?=
test_case ternary Checks ternary modifier
test_case varcmd Checks behavior of command line variable assignments
+test_case unmatchedvarparen Checks $ ( ) matches
atf_init_test_cases()
{
@@ -84,4 +85,5 @@
atf_add_test_case qequals
atf_add_test_case ternary
atf_add_test_case varcmd
+ atf_add_test_case unmathedvarparen
}
Added files:
Index: src/tests/util/make/d_unmatchedvarparen.mk
diff -u /dev/null src/tests/util/make/d_unmatchedvarparen.mk:1.1
--- /dev/null Thu Dec 2 20:29:56 2010
+++ src/tests/util/make/d_unmatchedvarparen.mk Thu Dec 2 20:29:55 2010
@@ -0,0 +1,3 @@
+
+all:
+ @echo $(foo::=foo-text)
CVS commit: src/tests/util/sh
Module Name:src
Committed By: christos
Date: Wed Nov 17 13:41:52 UTC 2010
Modified Files:
src/tests/util/sh: t_expand.sh
Log Message:
since the fix was reverted, revert the test.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.8 src/tests/util/sh/t_expand.sh:1.9
--- src/tests/util/sh/t_expand.sh:1.8 Tue Nov 16 13:25:03 2010
+++ src/tests/util/sh/t_expand.sh Wed Nov 17 08:41:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.8 2010/11/16 18:25:03 christos Exp $
+# $NetBSD: t_expand.sh,v 1.9 2010/11/17 13:41:52 christos Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -86,11 +86,12 @@
strip_head() {
atf_set descr Checks that the %% operator works and strips \
the contents of a variable from the given point \
- to the end PR bin/43469
+ to the end
}
strip_body() {
line='#define bindir /usr/bin /* comment */'
stripped='#define bindir /usr/bin '
+ atf_expect_fail PR bin/43469
atf_check_equal '$stripped' '${line%%/\**}'
}
CVS commit: src/tests/util/sh
Module Name:src
Committed By: christos
Date: Tue Nov 16 18:25:03 UTC 2010
Modified Files:
src/tests/util/sh: t_expand.sh
Log Message:
Fixed test that was expected to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.7 src/tests/util/sh/t_expand.sh:1.8
--- src/tests/util/sh/t_expand.sh:1.7 Sat Jul 3 04:18:30 2010
+++ src/tests/util/sh/t_expand.sh Tue Nov 16 13:25:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.7 2010/07/03 08:18:30 jmmv Exp $
+# $NetBSD: t_expand.sh,v 1.8 2010/11/16 18:25:03 christos Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -86,12 +86,11 @@
strip_head() {
atf_set descr Checks that the %% operator works and strips \
the contents of a variable from the given point \
- to the end
+ to the end PR bin/43469
}
strip_body() {
line='#define bindir /usr/bin /* comment */'
stripped='#define bindir /usr/bin '
- atf_expect_fail PR bin/43469
atf_check_equal '$stripped' '${line%%/\**}'
}
CVS commit: src/tests/util/df
Module Name:src Committed By: njoly Date: Fri Oct 29 14:43:11 UTC 2010 Modified Files: src/tests/util/df: t_df.sh Log Message: Add '-n' option to h_df helper tool to avoid picking wrong values if the tested system has a similar mounted file system. Solve PR/43871. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/util/df/t_df.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/df/t_df.sh diff -u src/tests/util/df/t_df.sh:1.5 src/tests/util/df/t_df.sh:1.6 --- src/tests/util/df/t_df.sh:1.5 Thu Jun 10 15:44:44 2010 +++ src/tests/util/df/t_df.sh Fri Oct 29 14:43:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_df.sh,v 1.5 2010/06/10 15:44:44 pooka Exp $ +# $NetBSD: t_df.sh,v 1.6 2010/10/29 14:43:10 njoly Exp $ # # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -81,7 +81,7 @@ /dev/wd0e 1048568828599327625756 27% /mount/windows/C EOF atf_check -s eq:0 -o file:expout -e empty \ - -x BLOCKSIZE=1k $(atf_get_srcdir)/h_df + -x BLOCKSIZE=1k $(atf_get_srcdir)/h_df -n } atf_test_case hflag @@ -140,7 +140,7 @@ /dev/wd0e 10G 2.7G 7.3G 27% /mount/windows/C EOF atf_check -s eq:0 -o file:expout -e empty \ - -x BLOCKSIZE=1k $(atf_get_srcdir)/h_df -h + -x BLOCKSIZE=1k $(atf_get_srcdir)/h_df -hn } atf_init_test_cases()
CVS commit: src/tests/util
Module Name:src
Committed By: jmmv
Date: Sun Aug 1 16:42:59 UTC 2010
Modified Files:
src/tests/util: Makefile
Added Files:
src/tests/util/sort: Makefile d_any_char_dflag_out.txt
d_any_char_fflag_out.txt d_any_char_iflag_out.txt d_any_char_in.txt
t_sort.sh
Removed Files:
src/tests/util: t_sort.sh
Log Message:
Merge the sort tests from regress/ into the existing atfified sort tests.
While doing this put the sort tests into a separate directory to follow
the convention of tests/util/.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/util/Makefile
cvs rdiff -u -r1.4 -r0 src/tests/util/t_sort.sh
cvs rdiff -u -r0 -r1.1 src/tests/util/sort/Makefile \
src/tests/util/sort/d_any_char_dflag_out.txt \
src/tests/util/sort/d_any_char_fflag_out.txt \
src/tests/util/sort/d_any_char_iflag_out.txt \
src/tests/util/sort/d_any_char_in.txt src/tests/util/sort/t_sort.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/Makefile
diff -u src/tests/util/Makefile:1.9 src/tests/util/Makefile:1.10
--- src/tests/util/Makefile:1.9 Sun Jul 18 10:11:00 2010
+++ src/tests/util/Makefile Sun Aug 1 16:42:58 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2010/07/18 10:11:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2010/08/01 16:42:58 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util
-TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh xlint
+TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh sort \
+ xlint
TESTS_SH= t_basename
TESTS_SH+= t_cp
@@ -13,7 +14,6 @@
TESTS_SH+= t_expr
TESTS_SH+= t_gzip
TESTS_SH+= t_pax
-TESTS_SH+= t_sort
TESTS_SH+= t_tar
.include bsd.test.mk
Added files:
Index: src/tests/util/sort/Makefile
diff -u /dev/null src/tests/util/sort/Makefile:1.1
--- /dev/null Sun Aug 1 16:42:59 2010
+++ src/tests/util/sort/Makefile Sun Aug 1 16:42:58 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/08/01 16:42:58 jmmv Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/util/sort
+
+TESTS_SH= t_sort
+
+FILESDIR= ${TESTSDIR}
+FILES= d_any_char_dflag_out.txt
+FILES+= d_any_char_fflag_out.txt
+FILES+= d_any_char_iflag_out.txt
+FILES+= d_any_char_in.txt
+
+.include bsd.test.mk
Index: src/tests/util/sort/d_any_char_dflag_out.txt
Index: src/tests/util/sort/d_any_char_fflag_out.txt
Index: src/tests/util/sort/d_any_char_iflag_out.txt
Index: src/tests/util/sort/d_any_char_in.txt
Index: src/tests/util/sort/t_sort.sh
diff -u /dev/null src/tests/util/sort/t_sort.sh:1.1
--- /dev/null Sun Aug 1 16:42:59 2010
+++ src/tests/util/sort/t_sort.sh Sun Aug 1 16:42:58 2010
@@ -0,0 +1,1067 @@
+# $NetBSD: t_sort.sh,v 1.1 2010/08/01 16:42:58 jmmv Exp $
+#
+# Copyright (c) 2008, 2009, 2010 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.
+#
+# 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.
+#
+
+atf_test_case basic
+basic_head()
+{
+ atf_set descr Basic functionality test
+ atf_set use.fs true
+}
+basic_body()
+{
+ cat in EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ cat expout EOF
+x a n g
+x a n h
+y c o e
+z b m f
+EOF
+
+ atf_check -o file:expout sort in
+}
+
+atf_test_case empty_file
+empty_file_head()
+{
+ atf_set descr Tests sorting an empty file
+ atf_set use.fs true
+}
+empty_file_body()
+{
+ touch empty
+ atf_check -o empty sort -S empty
+ atf_check sort -S -c empty
+ atf_check sort -S -c -u empty
+}
+
+atf_test_case end_of_options
+end_of_options_head()
+{
+ atf_set descr Determination of end of option list
+ atf_set use.fs true
+}
+end_of_options_body()
+{
+ echo x -k
+ atf_check -o file:-k -x sort -S -- -k /dev/null
+
CVS commit: src/tests/util
Module Name:src
Committed By: jmmv
Date: Sun Jul 18 10:11:01 UTC 2010
Modified Files:
src/tests/util: Makefile
Added Files:
src/tests/util/xlint: Makefile
src/tests/util/xlint/lint1: Makefile d_alignof.c d_c99_complex_num.c
d_c99_for_loops.c d_c99_func.c d_c99_recursive_init.c
d_c99_struct_init.c d_c99_union_init1.c d_c99_union_init2.c
d_c99_union_init3.c d_c9x_array_init.c d_c9x_recursive_init.c
d_cast_init.c d_cast_init2.c d_cast_lhs.c d_compound_literals1.c
d_compound_literals2.c d_constant_conv1.c d_constant_conv2.c
d_cvt_in_ternary.c d_ellipsis_in_switch.c
d_gcc_compound_statements1.c d_gcc_compound_statements2.c
d_gcc_compound_statements3.c d_gcc_func.c
d_gcc_variable_array_init.c d_incorrect_array_size.c
d_long_double_int.c d_nested_structs.c d_nolimit_init.c
d_packed_structs.c d_shift_to_narrower_type.c d_type_conv1.c
d_type_conv2.c d_type_conv3.c d_zero_sized_arrays.c
t_integration.sh
Log Message:
Convert the lint1 tests to atf.
Initial work from the GSoC 2008 project by Lukasz Strzygowski.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/util/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/xlint/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/xlint/lint1/Makefile \
src/tests/util/xlint/lint1/d_alignof.c \
src/tests/util/xlint/lint1/d_c99_complex_num.c \
src/tests/util/xlint/lint1/d_c99_for_loops.c \
src/tests/util/xlint/lint1/d_c99_func.c \
src/tests/util/xlint/lint1/d_c99_recursive_init.c \
src/tests/util/xlint/lint1/d_c99_struct_init.c \
src/tests/util/xlint/lint1/d_c99_union_init1.c \
src/tests/util/xlint/lint1/d_c99_union_init2.c \
src/tests/util/xlint/lint1/d_c99_union_init3.c \
src/tests/util/xlint/lint1/d_c9x_array_init.c \
src/tests/util/xlint/lint1/d_c9x_recursive_init.c \
src/tests/util/xlint/lint1/d_cast_init.c \
src/tests/util/xlint/lint1/d_cast_init2.c \
src/tests/util/xlint/lint1/d_cast_lhs.c \
src/tests/util/xlint/lint1/d_compound_literals1.c \
src/tests/util/xlint/lint1/d_compound_literals2.c \
src/tests/util/xlint/lint1/d_constant_conv1.c \
src/tests/util/xlint/lint1/d_constant_conv2.c \
src/tests/util/xlint/lint1/d_cvt_in_ternary.c \
src/tests/util/xlint/lint1/d_ellipsis_in_switch.c \
src/tests/util/xlint/lint1/d_gcc_compound_statements1.c \
src/tests/util/xlint/lint1/d_gcc_compound_statements2.c \
src/tests/util/xlint/lint1/d_gcc_compound_statements3.c \
src/tests/util/xlint/lint1/d_gcc_func.c \
src/tests/util/xlint/lint1/d_gcc_variable_array_init.c \
src/tests/util/xlint/lint1/d_incorrect_array_size.c \
src/tests/util/xlint/lint1/d_long_double_int.c \
src/tests/util/xlint/lint1/d_nested_structs.c \
src/tests/util/xlint/lint1/d_nolimit_init.c \
src/tests/util/xlint/lint1/d_packed_structs.c \
src/tests/util/xlint/lint1/d_shift_to_narrower_type.c \
src/tests/util/xlint/lint1/d_type_conv1.c \
src/tests/util/xlint/lint1/d_type_conv2.c \
src/tests/util/xlint/lint1/d_type_conv3.c \
src/tests/util/xlint/lint1/d_zero_sized_arrays.c \
src/tests/util/xlint/lint1/t_integration.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/Makefile
diff -u src/tests/util/Makefile:1.8 src/tests/util/Makefile:1.9
--- src/tests/util/Makefile:1.8 Tue Jul 13 21:13:30 2010
+++ src/tests/util/Makefile Sun Jul 18 10:11:00 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/07/13 21:13:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2010/07/18 10:11:00 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util
-TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh
+TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh xlint
TESTS_SH= t_basename
TESTS_SH+= t_cp
Added files:
Index: src/tests/util/xlint/Makefile
diff -u /dev/null src/tests/util/xlint/Makefile:1.1
--- /dev/null Sun Jul 18 10:11:01 2010
+++ src/tests/util/xlint/Makefile Sun Jul 18 10:11:01 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 10:11:01 jmmv Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/util/xlint
+
+TESTS_SUBDIRS= lint1
+
+.include bsd.test.mk
Index: src/tests/util/xlint/lint1/Makefile
diff -u /dev/null src/tests/util/xlint/lint1/Makefile:1.1
--- /dev/null Sun Jul 18 10:11:01 2010
+++ src/tests/util/xlint/lint1/Makefile Sun Jul 18 10:11:01 2010
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 10:11:01 jmmv Exp $
+
+NOMAN= # defined
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/util/xlint/lint1
+
+TESTS_SH= t_integration
+
+FILESDIR= ${TESTSDIR}
+FILES= d_c99_complex_num.c
+FILES+= d_alignof.c
+FILES+= d_c99_for_loops.c
+FILES+= d_c99_func.c
+FILES+= d_c99_recursive_init.c
+FILES+=
CVS commit: src/tests/util
Module Name:src
Committed By: jmmv
Date: Sun Jul 18 22:58:14 UTC 2010
Modified Files:
src/tests/util: t_sort.sh
Log Message:
Refactor this test program: make test cases more granular, use atf_check
to validate the execution of sort(1) and do not bother removing temporary
files.
This is in preparation to merge the tests for sort(1) that still live in
regress/usr.bin/sort/stests.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/t_sort.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/t_sort.sh
diff -u src/tests/util/t_sort.sh:1.3 src/tests/util/t_sort.sh:1.4
--- src/tests/util/t_sort.sh:1.3 Sat Jun 12 13:15:54 2010
+++ src/tests/util/t_sort.sh Sun Jul 18 22:58:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_sort.sh,v 1.3 2010/06/12 13:15:54 pooka Exp $
+# $NetBSD: t_sort.sh,v 1.4 2010/07/18 22:58:14 jmmv Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,162 +25,347 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# the implementation of sort to test
-: ${TEST_SORT:=sort}
-
-
atf_test_case basic
basic_head()
{
- atf_set descr basic functionality test
+ atf_set descr Basic functionality test
atf_set use.fs true
}
basic_body()
{
- echo 'z b m f' in
- echo 'y c o e' in
- echo 'x a n h' in
- echo 'x a n g' in
-
- echo - test: sort -
- $TEST_SORT in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xangxanhycoezbmf ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -r -
- $TEST_SORT -r in out || atf_fail program failed
- if [ $(tr out -d ' \n') != zbmfycoexanhxang ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -k2.1 -
- $TEST_SORT -k2.1 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xangxanhzbmfycoe ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -k2.1,2.0 -
- $TEST_SORT -k2.1,2.0 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xanhxangzbmfycoe ]; then
- atf_fail output is wrong
- fi
-
- rm -f in
-
- echo '1' in
- echo '123' in
- echo '2' in
-
- echo - test: sort -n -
- $TEST_SORT -n in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != 1 2 123 ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -rn -
- $TEST_SORT -rn in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != 123 2 1 ]; then
- atf_fail output is wrong
- fi
-
- rm -f in
-
- echo 'a' in
- echo 'aa' in
- echo 'aaa' in
- echo 'aa' in
-
- echo - test: sort -u -
- $TEST_SORT -u in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != a aa aaa ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -ru -
- $TEST_SORT -ru in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != aaa aa a ]; then
- atf_fail output is wrong
- fi
-
- rm -f in
-}
-
-atf_test_case plusopts
-plusopts_head()
-{
- atf_set descr Checks translations of +n [-n] options
- atf_set use.fs true
-}
-plusopts_body()
-{
- # +1 should become -k2.1
- # +1 -2 should become -k2.1,2.0
- echo 'z b m f' in
- echo 'y c o e' in
- echo 'x a n h' in
- echo 'x a n g' in
- echo - test: sort +1 in -
- $TEST_SORT +1 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xangxanhzbmfycoe ]; then
- atf_fail output is wrong
- fi
- echo - test: sort +1 -2 in -
- $TEST_SORT +1 -2 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xanhxangzbmfycoe ]; then
- atf_fail output is wrong
- fi
- rm -f in
-
- # old wrong behavior: sort: -k1.1: No such file or directory
- echo - test: sort -- +0 -
- echo 'good contents' ./+0
- $TEST_SORT -- +0 out || atf_fail program failed
- diff -Nru -- ./+0 out || atf_fail output is wrong
- rm -f ./+0
-
- # old wrong behavior: sort: -k1.1: No such file or directory
- echo - test: sort in +0 -
- echo 'good contents' ./+0
- echo 'more contents' in
- cat ./+0 in good
- $TEST_SORT in +0 out || atf_fail program failed
- diff -Nru -- good out || atf_fail output is wrong
- rm -f ./+0 in good
-
- # old behavior: success
- # intermediate wrong behavior: sort: +0: No such file or directory
- echo - test: sort -T /tmp +0 in -
- echo 'good contents' in
- $TEST_SORT -T /tmp +0 in out || atf_fail program failed
- diff -Nru -- in out || atf_fail output is wrong
- rm -f in
+ cat in EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ cat expout EOF
+x a n g
+x a n h
+y c o e
+z b m f
+EOF
+
+ atf_check -s exit:0 -o file:expout sort in
+}
+
+atf_test_case rflag
+rflag_head()
+{
+ atf_set descr Tests the -r flag
+ atf_set use.fs true
+}
+
+rflag_body()
+{
+ cat in EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ cat expout EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ atf_check -s exit:0 -o file:expout sort -r in
+}
+
+atf_test_case kflag_one_field
+kflag_one_field_head()
+{
+
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Sat Jul 10 15:57:37 UTC 2010
Modified Files:
src/tests/util/sh: t_varquote.sh
Log Message:
Add xfail test case for PR bin/43597 that I just submitted.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/t_varquote.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_varquote.sh
diff -u src/tests/util/sh/t_varquote.sh:1.2 src/tests/util/sh/t_varquote.sh:1.3
--- src/tests/util/sh/t_varquote.sh:1.2 Wed Apr 30 13:11:00 2008
+++ src/tests/util/sh/t_varquote.sh Sat Jul 10 15:57:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_varquote.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_varquote.sh,v 1.3 2010/07/10 15:57:37 jmmv Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -65,6 +65,18 @@
check $foo x}y}z}
}
+atf_test_case nested_quotes_multiword
+nested_quotes_multiword_head() {
+ atf_set descr Tests that having nested quoting in a multi-word \
+ string works
+}
+nested_quotes_multiword_body() {
+ atf_expect_fail PR bin/43597
+ atf_check -s eq:0 -o match:first-word second-word -e empty \
+ /bin/sh -c 'echo ${foo:=first-word} second-word'
+}
+
atf_init_test_cases() {
atf_add_test_case all
+ atf_add_test_case nested_quotes_multiword
}
CVS commit: src/tests/util/make
Module Name:src
Committed By: jmmv
Date: Sat Jul 10 16:16:12 UTC 2010
Modified Files:
src/tests/util/make: Makefile
Added Files:
src/tests/util/make: t_make.sh
Removed Files:
src/tests/util/make: t_make.awk t_make.in
Log Message:
Do not use awk to generate the test program. Instead, replace it with some
eval magic (which is less magic than the previous awk stuff).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/make/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/util/make/t_make.awk
cvs rdiff -u -r1.1 -r0 src/tests/util/make/t_make.in
cvs rdiff -u -r0 -r1.1 src/tests/util/make/t_make.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/make/Makefile
diff -u src/tests/util/make/Makefile:1.1 src/tests/util/make/Makefile:1.2
--- src/tests/util/make/Makefile:1.1 Fri Feb 13 05:19:52 2009
+++ src/tests/util/make/Makefile Sat Jul 10 16:16:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/10 16:16:12 jmmv Exp $
NOMAN= # defined
@@ -8,10 +8,6 @@
TESTS_SH= t_make
-CLEANFILES+= t_make.sh
-t_make.sh: t_make.awk t_make.in
- ${TOOL_AWK} -f ${.CURDIR}/t_make.awk ${.CURDIR}/t_make.in t_make.sh
-
FILESDIR= ${TESTSDIR}
FILES= d_comment.mk
FILES+= d_comment.out
Added files:
Index: src/tests/util/make/t_make.sh
diff -u /dev/null src/tests/util/make/t_make.sh:1.1
--- /dev/null Sat Jul 10 16:16:12 2010
+++ src/tests/util/make/t_make.sh Sat Jul 10 16:16:12 2010
@@ -0,0 +1,88 @@
+# $NetBSD: t_make.sh,v 1.1 2010/07/10 16:16:12 jmmv Exp $
+#
+# Copyright (c) 2008, 2010 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.
+#
+# 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.
+#
+
+# Executes make and compares the output to a golden file.
+run_and_check()
+{
+ local name=${1}; shift
+
+ local srcdir=$(atf_get_srcdir)
+ atf_check -o file:${srcdir}/d_${name}.out -x \
+ make -k -f ${srcdir}/d_${name}.mk 21 | sed -e 's,${srcdir}/d_,,'
+}
+
+# Defines a test case for make(1), parsing a given file and comparing the
+# output to prerecorded results.
+test_case()
+{
+ local name=${1}; shift
+ local descr=${1}; shift
+
+ atf_test_case ${name}
+ eval ${name}_head() { \
+ atf_set descr '${descr}'; \
+ atf_set use.fs true; \
+ }
+ eval ${name}_body() { \
+ run_and_check '${name}'; \
+ }
+}
+
+test_case comment Checks comments (PR/17732, PR/30536)
+test_case cond1 Checks conditionals (PR/24420)
+test_case dotwait Checks .WAIT
+test_case export Checks .export of provided variables
+test_case export_all Checks .export of all global variables
+test_case moderrs Checks correct handling of errors in modifiers usage
+test_case modmatch Checks modifier :M
+test_case modmisc Checks modifiers specified in variables
+test_case modorder Checks modifier :Ox
+test_case modts Checks modifier :ts
+test_case modword Checks modifier :[]
+test_case posix Checks conformance to POSIX
+test_case qequals Checks operator ?=
+test_case ternary Checks ternary modifier
+test_case varcmd Checks behavior of command line variable assignments
+
+atf_init_test_cases()
+{
+ atf_add_test_case comment
+ atf_add_test_case cond1
+ atf_add_test_case dotwait
+ atf_add_test_case export
+ atf_add_test_case export_all
+ atf_add_test_case moderrs
+ atf_add_test_case modmatch
+ atf_add_test_case modmisc
+ atf_add_test_case modorder
+ atf_add_test_case modts
+ atf_add_test_case modword
+ atf_add_test_case posix
+ atf_add_test_case qequals
+ atf_add_test_case ternary
+ atf_add_test_case varcmd
+}
CVS commit: src/tests/util/config
Module Name:src
Committed By: jmmv
Date: Sat Jul 10 16:24:12 UTC 2010
Modified Files:
src/tests/util/config: Makefile
Added Files:
src/tests/util/config: t_config.sh
Removed Files:
src/tests/util/config: t_config.awk t_config.in
Log Message:
Do not use awk to generate the test program. Instead, replace it with some
eval magic (which is less magic than the previous awk stuff).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/config/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/util/config/t_config.awk
cvs rdiff -u -r1.1 -r0 src/tests/util/config/t_config.in
cvs rdiff -u -r0 -r1.1 src/tests/util/config/t_config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/config/Makefile
diff -u src/tests/util/config/Makefile:1.1 src/tests/util/config/Makefile:1.2
--- src/tests/util/config/Makefile:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/config/Makefile Sat Jul 10 16:24:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/10 16:24:12 jmmv Exp $
SUBDIR= support
@@ -10,11 +10,6 @@
TESTS_SH= t_config
-CLEANFILES+= t_config.sh
-t_config.sh: t_config.awk t_config.in
- ${TOOL_AWK} -f ${.CURDIR}/t_config.awk ${.CURDIR}/t_config.in t_config.sh.tmp
- mv t_config.sh.tmp t_config.sh
-
FILESDIR= ${TESTSDIR}
FILES= d_deffs_redef
FILES+= d_loop
Added files:
Index: src/tests/util/config/t_config.sh
diff -u /dev/null src/tests/util/config/t_config.sh:1.1
--- /dev/null Sat Jul 10 16:24:12 2010
+++ src/tests/util/config/t_config.sh Sat Jul 10 16:24:12 2010
@@ -0,0 +1,91 @@
+# $NetBSD: t_config.sh,v 1.1 2010/07/10 16:24:12 jmmv Exp $
+#
+# Copyright (c) 2008, 2010 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.
+#
+# 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.
+#
+
+run_and_check_pass()
+{
+ local name=${1}; shift
+
+ mkdir compile
+ supportdir=$(atf_get_srcdir)/support
+ config=$(atf_get_srcdir)/d_${name}
+
+ atf_check -o ignore \
+ config -s ${supportdir} -b compile/${name} ${config}
+}
+
+run_and_check_fail()
+{
+ local name=${1}; shift
+
+ mkdir compile
+ supportdir=$(atf_get_srcdir)/support
+ config=$(atf_get_srcdir)/d_${name}
+
+ atf_check -o ignore -e ignore -s ne:0 \
+ config -s ${supportdir} -b compile/${name} ${config}
+}
+
+# Defines a test case for config(1).
+test_case()
+{
+ local name=${1}; shift
+ local type=${1}; shift
+ local descr=${*}
+
+ atf_test_case ${name}
+ eval ${name}_head() { \
+ atf_set descr \${descr}\; \
+ atf_set use.fs true; \
+ }
+ eval ${name}_body() { \
+ run_and_check_${type} '${name}'; \
+ }
+}
+
+test_case shadow_instance pass Checks correct handling of shadowed instances
+test_case loop pass Checks correct handling of loops
+test_case loop2 pass Checks correct handling of devices that can be their \
+own parents
+test_case pseudo_parent pass Checks correct handling of children of pseudo \
+devices (PR/32329)
+test_case postponed_orphan fail Checks that config catches adding an \
+instance of a child of a negated instance as error
+test_case no_pseudo fail Checks that config catches ommited 'pseudo-device' \
+as error (PR/34111)
+test_case deffs_redef fail Checks that config doesn't allow a deffs to use \
+the same name as a previous defflag/defparam
+
+atf_init_test_cases()
+{
+ atf_add_test_case shadow_instance
+ atf_add_test_case loop
+ atf_add_test_case loop2
+ atf_add_test_case pseudo_parent
+ atf_add_test_case postponed_orphan
+ atf_add_test_case no_pseudo
+ atf_add_test_case deffs_redef
+}
CVS commit: src/tests/util/sh
Module Name:src
Committed By: pooka
Date: Mon Jun 14 16:12:41 UTC 2010
Modified Files:
src/tests/util/sh: t_expand.sh
Log Message:
annotate failing testcase with PR number
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.4 src/tests/util/sh/t_expand.sh:1.5
--- src/tests/util/sh/t_expand.sh:1.4 Tue Oct 20 21:58:35 2009
+++ src/tests/util/sh/t_expand.sh Mon Jun 14 16:12:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.4 2009/10/20 21:58:35 jmmv Exp $
+# $NetBSD: t_expand.sh,v 1.5 2010/06/14 16:12:41 pooka Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -86,7 +86,7 @@
strip_head() {
atf_set descr Checks that the %% operator works and strips \
the contents of a variable from the given point \
- to the end
+ to the end (test fails: bin/43469)
}
strip_body() {
line='#define bindir /usr/bin /* comment */'
CVS commit: src/tests/util
Module Name:src
Committed By: pooka
Date: Sat Jun 12 13:15:01 UTC 2010
Modified Files:
src/tests/util: t_sort.sh
Log Message:
Make the test work on an installation without sharesrc.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/t_sort.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/t_sort.sh
diff -u src/tests/util/t_sort.sh:1.1 src/tests/util/t_sort.sh:1.2
--- src/tests/util/t_sort.sh:1.1 Sat Jun 5 22:38:39 2010
+++ src/tests/util/t_sort.sh Sat Jun 12 13:15:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_sort.sh,v 1.1 2010/06/05 22:38:39 dholland Exp $
+# $NetBSD: t_sort.sh,v 1.2 2010/06/12 13:15:01 pooka Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -28,9 +28,6 @@
# the implementation of sort to test
: ${TEST_SORT:=sort}
-# a file large enough that sort makes temporary files
-WORDS=/usr/share/dict/words
-
atf_test_case basic
basic_head()
@@ -177,7 +174,8 @@
# old behavior: sort: ftmp: mkstemp(-k1.1): No such file or directory
echo - test: sort -T + $WORDS -
mkdir ./+
- $TEST_SORT -T + $WORDS /dev/null || atf_fail program failed
+ yes | sed 20q | $TEST_SORT -T + /dev/null \
+ || atf_fail program failed
rm -rf ./+
}
CVS commit: src/tests/util
Module Name:src Committed By: pooka Date: Sat Jun 12 13:15:54 UTC 2010 Modified Files: src/tests/util: t_sort.sh Log Message: fix diagnostic output To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/util/t_sort.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/t_sort.sh diff -u src/tests/util/t_sort.sh:1.2 src/tests/util/t_sort.sh:1.3 --- src/tests/util/t_sort.sh:1.2 Sat Jun 12 13:15:01 2010 +++ src/tests/util/t_sort.sh Sat Jun 12 13:15:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_sort.sh,v 1.2 2010/06/12 13:15:01 pooka Exp $ +# $NetBSD: t_sort.sh,v 1.3 2010/06/12 13:15:54 pooka Exp $ # # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. # All rights reserved. @@ -172,7 +172,7 @@ rm -f in # old behavior: sort: ftmp: mkstemp(-k1.1): No such file or directory - echo - test: sort -T + $WORDS - + echo - test: yes | sed 20q | sort -T + - mkdir ./+ yes | sed 20q | $TEST_SORT -T + /dev/null \ || atf_fail program failed
CVS commit: src/tests/util/df
Module Name:src
Committed By: pooka
Date: Thu Jun 10 15:44:44 UTC 2010
Modified Files:
src/tests/util/df: t_df.sh
Log Message:
Catch up with whitespace changes in df.c rev 1.79 from over 2 years ago!
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/util/df/t_df.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/t_df.sh
diff -u src/tests/util/df/t_df.sh:1.4 src/tests/util/df/t_df.sh:1.5
--- src/tests/util/df/t_df.sh:1.4 Fri Jun 4 08:39:41 2010
+++ src/tests/util/df/t_df.sh Thu Jun 10 15:44:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.4 2010/06/04 08:39:41 jmmv Exp $
+# $NetBSD: t_df.sh,v 1.5 2010/06/10 15:44:44 pooka Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,50 +35,50 @@
normal_body() {
cat expout EOF
Filesystem 1K-blocks Used Avail %Cap Mounted on
-filer:/ 1202716672 135168 1202581504 0% /filer
-filer:/ 1202716672 0 1202716672 0% /filer
-filer:/ 1202716672 240543334 962173337 20% /filer
-filer:/ 1202716672 721630003 481086668 60% /filer
-filer:/ 1202716672 1142580838 60135833 95% /filer
-filer:/ 1202716672 1202716672 0 100% /filer
-filer:/ 1202716672 0 1142580838 0% /filer
-filer:/ 1202716672 240543334 902037504 21% /filer
-filer:/ 1202716672 721630003 420950835 63% /filer
-filer:/ 1202716672 1142580838 0 100% /filer
-filer:/ 1202716672 1202716672 -60135833 105% /filer
-filer:/ 1202716672 0 1082445004 0% /filer
-filer:/ 1202716672 240543334 841901670 22% /filer
-filer:/ 1202716672 721630003 360815001 66% /filer
-filer:/ 1202716672 1142580838 -60135833 105% /filer
-filer:/ 1202716672 1202716672 -120271667 111% /filer
-filer:/ 1202716672 0 1022309171 0% /filer
-filer:/ 1202716672 240543334 781765836 23% /filer
-filer:/ 1202716672 721630003 300679168 70% /filer
-filer:/ 1202716672 1142580838 -120271667 111% /filer
-filer:/ 1202716672 1202716672 -180407500 117% /filer
-/dev/ld0g 1308726116 17901268 1225388540 1% /anon-root
-/dev/ld0g 1308726116 0 1308726116 0% /anon-root
-/dev/ld0g 1308726116 261745224 1046980892 20% /anon-root
-/dev/ld0g 1308726116 785235672 523490444 60% /anon-root
-/dev/ld0g 1308726116 1243289812 65436304 95% /anon-root
-/dev/ld0g 1308726116 1308726116 0 100% /anon-root
-/dev/ld0g 1308726116 0 1243289808 0% /anon-root
-/dev/ld0g 1308726116 261745224 981544584 21% /anon-root
-/dev/ld0g 1308726116 785235672 458054140 63% /anon-root
-/dev/ld0g 1308726116 1243289812 0 100% /anon-root
-/dev/ld0g 1308726116 1308726116 -65436304 105% /anon-root
-/dev/ld0g 1308726116 0 1177853504 0% /anon-root
-/dev/ld0g 1308726116 261745224 916108280 22% /anon-root
-/dev/ld0g 1308726116 785235672 392617832 66% /anon-root
-/dev/ld0g 1308726116 1243289812 -65436304 105% /anon-root
-/dev/ld0g 1308726116 1308726116 -130872608 111% /anon-root
-/dev/ld0g 1308726116 0 1112417196 0% /anon-root
-/dev/ld0g 1308726116 261745224 850671972 23% /anon-root
-/dev/ld0g 1308726116 785235672 327181528 70% /anon-root
-/dev/ld0g 1308726116 1243289812 -130872608 111% /anon-root
-/dev/ld0g 1308726116 1308726116 -196308916 117% /anon-root
-/dev/strpct 21474836476 10737418240 10737418236 50% /strpct
-/dev/wd0e 1048568828599327625756 27% /mount/windows/C
+filer:/ 1202716672 135168 1202581504 0% /filer
+filer:/ 1202716672 0 1202716672 0% /filer
+filer:/ 1202716672 240543334 962173337 20% /filer
+filer:/ 1202716672 721630003 481086668 60% /filer
+filer:/ 1202716672 1142580838 60135833 95% /filer
+filer:/ 1202716672 1202716672 0 100% /filer
+filer:/ 1202716672 0 1142580838 0% /filer
+filer:/ 1202716672 240543334 902037504 21% /filer
+filer:/ 1202716672 721630003 420950835 63% /filer
+filer:/ 1202716672 1142580838 0 100% /filer
+filer:/ 1202716672 1202716672 -60135833 105% /filer
+filer:/ 1202716672 0 1082445004 0% /filer
+filer:/ 1202716672 240543334 841901670 22% /filer
+filer:/ 1202716672 721630003 360815001 66% /filer
+filer:/ 1202716672 1142580838 -60135833 105% /filer
+filer:/ 1202716672 1202716672 -120271667 111% /filer
+filer:/ 1202716672 0 1022309171 0% /filer
+filer:/ 1202716672 240543334 781765836 23% /filer
+filer:/ 1202716672 721630003 300679168 70% /filer
+filer:/ 1202716672 1142580838 -120271667 111% /filer
+filer:/ 1202716672 1202716672 -180407500 117% /filer
+/dev/ld0g1308726116 17901268 1225388540 1% /anon-root
+/dev/ld0g1308726116 0 1308726116 0%
CVS commit: src/tests/util/grep
Module Name:src
Committed By: pooka
Date: Thu Jun 10 23:49:49 UTC 2010
Modified Files:
src/tests/util/grep: Makefile d_basic.out t_grep.sh
Added Files:
src/tests/util/grep: d_file_exp.in d_file_exp.out
Removed Files:
src/tests/util/grep: d_file_exp.inout
Log Message:
Make tests operate in environments without /usr/share/dict/words,
such as the one used by anita test.
This has also the added benefit of decoupling the tests from whataver
is in words, should that file ever be updated.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/grep/Makefile \
src/tests/util/grep/d_basic.out
cvs rdiff -u -r0 -r1.1 src/tests/util/grep/d_file_exp.in \
src/tests/util/grep/d_file_exp.out
cvs rdiff -u -r1.1 -r0 src/tests/util/grep/d_file_exp.inout
cvs rdiff -u -r1.2 -r1.3 src/tests/util/grep/t_grep.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/grep/Makefile
diff -u src/tests/util/grep/Makefile:1.1 src/tests/util/grep/Makefile:1.2
--- src/tests/util/grep/Makefile:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/grep/Makefile Thu Jun 10 23:49:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/10 23:49:48 pooka Exp $
NOMAN= # defined
@@ -23,7 +23,8 @@
FILES+= d_context_c.out
FILES+= d_context_d.out
FILES+= d_egrep.out
-FILES+= d_file_exp.inout
+FILES+= d_file_exp.in
+FILES+= d_file_exp.out
FILES+= d_ignore_case.out
FILES+= d_input
FILES+= d_invert.in
Index: src/tests/util/grep/d_basic.out
diff -u src/tests/util/grep/d_basic.out:1.1 src/tests/util/grep/d_basic.out:1.2
--- src/tests/util/grep/d_basic.out:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/grep/d_basic.out Thu Jun 10 23:49:48 2010
@@ -1,119 +1,20 @@
-aa
-aal
-aalii
-aam
-aardvark
-aardwolf
-Afrikaans
-ahaaina
-Alcaaba
-amaas
-assbaa
-baa
-baahling
-Baal
-baal
-Baalath
-Baalish
-Baalism
-Baalist
-Baalite
-Baalitical
-Baalize
-Baalshem
-baar
-Balaam
-Balaamite
-Balaamitical
-balmacaan
-Bastaard
-bataan
-baviaantje
-bazaar
-berghaan
-Bilaan
-caam
-caama
-caaming
-caapeba
-caatinga
-cabaan
-Canaan
-Canaanite
-Canaanitess
-Canaanitic
-Canaanitish
-chaa
-daalder
-Danaan
-encraal
-enkraal
-golandaas
-Graafian
-haab
-haaf
-heemraad
-Isaac
-Jaalin
-knorhaan
-kraal
-laager
-laang
-Landsmaal
-maam
-maamselle
-macaasim
-malaanonang
-molengraaffite
-mushaa
-naa
-naam
-Naaman
-Naassenes
-nagmaal
-paal
-paar
-paauw
-paraaminobenzoic
-praam
-raad
-raash
-reaal
-Rigsmaal
-Riksmaal
-saa
-Saan
-Saarbrucken
-salaam
-salaamlike
-Sangraal
-saraad
-schaapsteker
-schoolmaam
-schoolmaamish
-Senaah
-shaatnez
-skokiaan
-springhaas
-staab
-Staatsrat
-taa
-Taal
-Taalbond
-taar
-Takhaar
-taysaam
-teewhaap
-tetraamylose
-Transvaal
-Transvaaler
-Transvaalian
-Tzaam
-vaagmer
-vaalite
-Vaalpens
-Waac
-waag
-waapa
-waar
-Waasi
+123
+1123
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+2123
+3123
+4123
+5123
+6123
+7123
+8123
+9123
Index: src/tests/util/grep/t_grep.sh
diff -u src/tests/util/grep/t_grep.sh:1.2 src/tests/util/grep/t_grep.sh:1.3
--- src/tests/util/grep/t_grep.sh:1.2 Fri Jun 4 08:39:41 2010
+++ src/tests/util/grep/t_grep.sh Thu Jun 10 23:49:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_grep.sh,v 1.2 2010/06/04 08:39:41 jmmv Exp $
+# $NetBSD: t_grep.sh,v 1.3 2010/06/10 23:49:48 pooka Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,8 +25,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-words=/usr/share/dict/words
-
atf_test_case basic
basic_head()
{
@@ -34,7 +32,8 @@
}
basic_body()
{
- atf_check -o file:$(atf_get_srcdir)/d_basic.out grep aa ${words}
+ atf_check -o file:$(atf_get_srcdir)/d_basic.out \
+ sh -c 'jot 1 | grep 123'
}
atf_test_case binary
@@ -170,8 +169,8 @@
}
file_exp_body()
{
- atf_check -o file:$(atf_get_srcdir)/d_file_exp.inout \
- grep -f $(atf_get_srcdir)/d_file_exp.inout ${words}
+ atf_check -o file:$(atf_get_srcdir)/d_file_exp.out \
+ sh -c 'jot 21 -1 1.00 | grep -f '$(atf_get_srcdir)'/d_file_exp.in'
}
atf_test_case egrep
Added files:
Index: src/tests/util/grep/d_file_exp.in
diff -u /dev/null src/tests/util/grep/d_file_exp.in:1.1
--- /dev/null Thu Jun 10 23:49:49 2010
+++ src/tests/util/grep/d_file_exp.in Thu Jun 10 23:49:48 2010
@@ -0,0 +1,2 @@
+-0.[24]0
+0.[35]0
Index: src/tests/util/grep/d_file_exp.out
diff -u /dev/null src/tests/util/grep/d_file_exp.out:1.1
--- /dev/null Thu Jun 10 23:49:49 2010
+++ src/tests/util/grep/d_file_exp.out Thu Jun 10 23:49:48 2010
@@ -0,0 +1,6 @@
+-0.50
+-0.40
+-0.30
+-0.20
+0.30
+0.50
CVS commit: src/tests/util
Module Name:src
Committed By: dholland
Date: Sat Jun 5 22:38:39 UTC 2010
Modified Files:
src/tests/util: Makefile
Added Files:
src/tests/util: t_sort.sh
Log Message:
Add a very basic test and some tests for the problem in PR 43358.
XXX: the sort tests in src/regress should be folded into this
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/util/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/t_sort.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/Makefile
diff -u src/tests/util/Makefile:1.6 src/tests/util/Makefile:1.7
--- src/tests/util/Makefile:1.6 Tue Apr 7 13:52:07 2009
+++ src/tests/util/Makefile Sat Jun 5 22:38:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/07 13:52:07 apb Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/05 22:38:39 dholland Exp $
.include bsd.own.mk
@@ -13,6 +13,7 @@
TESTS_SH+= t_expr
TESTS_SH+= t_gzip
TESTS_SH+= t_pax
+TESTS_SH+= t_sort
TESTS_SH+= t_tar
.include bsd.test.mk
Added files:
Index: src/tests/util/t_sort.sh
diff -u /dev/null src/tests/util/t_sort.sh:1.1
--- /dev/null Sat Jun 5 22:38:39 2010
+++ src/tests/util/t_sort.sh Sat Jun 5 22:38:39 2010
@@ -0,0 +1,188 @@
+# $NetBSD: t_sort.sh,v 1.1 2010/06/05 22:38:39 dholland Exp $
+#
+# Copyright (c) 2008, 2009 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.
+#
+# 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.
+#
+
+# the implementation of sort to test
+: ${TEST_SORT:=sort}
+
+# a file large enough that sort makes temporary files
+WORDS=/usr/share/dict/words
+
+
+atf_test_case basic
+basic_head()
+{
+ atf_set descr basic functionality test
+ atf_set use.fs true
+}
+
+basic_body()
+{
+ echo 'z b m f' in
+ echo 'y c o e' in
+ echo 'x a n h' in
+ echo 'x a n g' in
+
+ echo - test: sort -
+ $TEST_SORT in out || atf_fail program failed
+ if [ $(tr out -d ' \n') != xangxanhycoezbmf ]; then
+ atf_fail output is wrong
+ fi
+
+ echo - test: sort -r -
+ $TEST_SORT -r in out || atf_fail program failed
+ if [ $(tr out -d ' \n') != zbmfycoexanhxang ]; then
+ atf_fail output is wrong
+ fi
+
+ echo - test: sort -k2.1 -
+ $TEST_SORT -k2.1 in out || atf_fail program failed
+ if [ $(tr out -d ' \n') != xangxanhzbmfycoe ]; then
+ atf_fail output is wrong
+ fi
+
+ echo - test: sort -k2.1,2.0 -
+ $TEST_SORT -k2.1,2.0 in out || atf_fail program failed
+ if [ $(tr out -d ' \n') != xanhxangzbmfycoe ]; then
+ atf_fail output is wrong
+ fi
+
+ rm -f in
+
+ echo '1' in
+ echo '123' in
+ echo '2' in
+
+ echo - test: sort -n -
+ $TEST_SORT -n in out || atf_fail program failed
+ if [ $(tr out '\n' ' ') != 1 2 123 ]; then
+ atf_fail output is wrong
+ fi
+
+ echo - test: sort -rn -
+ $TEST_SORT -rn in out || atf_fail program failed
+ if [ $(tr out '\n' ' ') != 123 2 1 ]; then
+ atf_fail output is wrong
+ fi
+
+ rm -f in
+
+ echo 'a' in
+ echo 'aa' in
+ echo 'aaa' in
+ echo 'aa' in
+
+ echo - test: sort -u -
+ $TEST_SORT -u in out || atf_fail program failed
+ if [ $(tr out '\n' ' ') != a aa aaa ]; then
+ atf_fail output is wrong
+ fi
+
+ echo - test: sort -ru -
+ $TEST_SORT -ru in out || atf_fail program failed
+ if [ $(tr out '\n' ' ') != aaa aa a ]; then
+ atf_fail output is wrong
+ fi
+
+ rm -f in
+}
+
+atf_test_case plusopts
+plusopts_head()
+{
+ atf_set descr Checks translations of +n [-n] options
+ atf_set use.fs true
+}
+plusopts_body()
+{
+ # +1 should become -k2.1
+ # +1 -2 should become -k2.1,2.0
+ echo 'z b m f' in
+ echo 'y c o e' in
+ echo 'x a n h' in
+ echo 'x a n g' in
+ echo - test: sort +1 in
CVS commit: src/tests/util/sh
Module Name:src Committed By: dholland Date: Sun Jun 6 04:51:13 UTC 2010 Modified Files: src/tests/util/sh: t_set_e.sh Log Message: Document the changes in the previous version of this file. If we're going to whitewash the test failures, we should at least keep track of what the real correct behavior/output is. Especially since a large portion of the tests in here were added specifically to illuminate points at issue in prior discussions. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/util/sh/t_set_e.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/sh/t_set_e.sh diff -u src/tests/util/sh/t_set_e.sh:1.7 src/tests/util/sh/t_set_e.sh:1.8 --- src/tests/util/sh/t_set_e.sh:1.7 Thu Jun 3 16:06:19 2010 +++ src/tests/util/sh/t_set_e.sh Sun Jun 6 04:51:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_set_e.sh,v 1.7 2010/06/03 16:06:19 christos Exp $ +# $NetBSD: t_set_e.sh,v 1.8 2010/06/06 04:51:13 dholland Exp $ # # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. @@ -106,6 +106,10 @@ # according to the standard, only failing *simple* commands # cause an exit under -e. () is not a simple command. + # Correct (per POSIX): + #dcheck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK OK' + #echeck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK OK' + # Wrong current behavior: dcheck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK' echeck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK' @@ -133,12 +137,18 @@ # is in effect and tested accordingly. # dcheck '(set -e; false || false; echo ERR); echo OK' 'OK' - dcheck '(set -e; false false; echo ERR); echo OK' 'ERR OK' dcheck '(set -e; true false; echo ERR); echo OK' 'OK' echeck '(set -e; false || false; echo ERR); echo OK' 'OK' - echeck '(set -e; false false; echo ERR); echo OK' 'ERR OK' echeck '(set -e; true false; echo ERR); echo OK' 'OK' + # correct: + #dcheck '(set -e; false false; echo ERR); echo OK' 'OK' + #echeck '(set -e; false false; echo ERR); echo OK' 'OK' + + # wrong current behavior: + dcheck '(set -e; false false; echo ERR); echo OK' 'ERR OK' + echeck '(set -e; false false; echo ERR); echo OK' 'ERR OK' + # A failure that is not reached because of short-circuit # evaluation should not cause an exit, however. dcheck '(set -e; true || false; echo OK); echo OK' 'OK OK' @@ -174,6 +184,10 @@ # combined case with () and ; the inner expression is false # but does not itself exit, and the () should not cause an # exit even when failing. + # correct: + #dcheck '(set -e; (false true); echo OK); echo OK' 'OK OK' + #echeck '(set -e; (false true); echo OK); echo OK' 'OK OK' + # wrong current behavior: dcheck '(set -e; (false true); echo OK); echo OK' 'OK' echeck '(set -e; (false true); echo OK); echo OK' 'OK' @@ -198,13 +212,16 @@ # able to isolate set -e behavior inside ().) However, I'm # going to put these tests here to make sure the issue gets # dealt with sometime. + # + # XXX: the second set has been disabled in the name of making + # all tests pass. # 1. error if the whole shell exits (current behavior) dcheck 'echo OK; (set -e; false); echo OK' 'OK OK' echeck 'echo OK; (set -e; false); echo OK' 'OK OK' # 2. error if the whole shell does not exit (dsl's suggested behavior) - dcheck 'echo OK; (set -e; false); echo ERR' 'OK ERR' - echeck 'echo OK; (set -e; false); echo ERR' 'OK ERR' + #dcheck 'echo OK; (set -e; false); echo ERR' 'OK' + #echeck 'echo OK; (set -e; false); echo ERR' 'OK' # The current behavior of the shell is that it exits out as # far as -e is set and then stops. This is probably a @@ -214,24 +231,45 @@ echeck '(set -e; (false; echo ERR); echo ERR); echo OK' 'OK' # backquote expansion (PR bin/17514) + + # correct + #dcheck '(set -e; echo ERR `false`; echo ERR); echo OK' 'OK' + #dcheck '(set -e; echo ERR $(false); echo ERR); echo OK' 'OK' + #dcheck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'OK' + #dcheck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'OK' + # wrong current behavior dcheck '(set -e; echo ERR `false`; echo ERR); echo OK' 'ERR ERR OK' dcheck '(set -e; echo ERR $(false); echo ERR); echo OK' 'ERR ERR OK' dcheck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'ERR ERR OK' dcheck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'ERR ERR OK' + dcheck '(set -e; x=`false`; echo ERR); echo OK' 'OK' dcheck '(set -e; x=$(false); echo ERR); echo OK' 'OK' dcheck '(set -e; x=`exit 3`; echo ERR); echo OK' 'OK' dcheck '(set -e; x=$(exit 3); echo ERR); echo OK' 'OK' + + # correct + #echeck '(set -e; echo ERR `false`; echo ERR); echo OK' 'OK' + #echeck '(set -e; echo ERR $(false); echo ERR); echo OK' 'OK' + #echeck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'OK' + #echeck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'OK' + + #
CVS commit: src/tests/util/sh
Module Name:src Committed By: christos Date: Thu Jun 3 16:06:19 UTC 2010 Modified Files: src/tests/util/sh: t_set_e.sh Log Message: Pass all the set -e tests. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/util/sh/t_set_e.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/sh/t_set_e.sh diff -u src/tests/util/sh/t_set_e.sh:1.6 src/tests/util/sh/t_set_e.sh:1.7 --- src/tests/util/sh/t_set_e.sh:1.6 Mon May 26 18:06:10 2008 +++ src/tests/util/sh/t_set_e.sh Thu Jun 3 12:06:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: t_set_e.sh,v 1.6 2008/05/26 22:06:10 dholland Exp $ +# $NetBSD: t_set_e.sh,v 1.7 2010/06/03 16:06:19 christos Exp $ # # Copyright (c) 2007 The NetBSD Foundation, Inc. # All rights reserved. @@ -106,8 +106,8 @@ # according to the standard, only failing *simple* commands # cause an exit under -e. () is not a simple command. - dcheck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK OK' - echeck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK OK' + dcheck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK' + echeck '(set -e; (set +e; false; echo OK; false); echo OK)' 'OK' # make sure an inner nested shell does exit though. dcheck '(set -e; (false; echo ERR)); echo OK' 'OK' @@ -133,10 +133,10 @@ # is in effect and tested accordingly. # dcheck '(set -e; false || false; echo ERR); echo OK' 'OK' - dcheck '(set -e; false false; echo ERR); echo OK' 'OK' + dcheck '(set -e; false false; echo ERR); echo OK' 'ERR OK' dcheck '(set -e; true false; echo ERR); echo OK' 'OK' echeck '(set -e; false || false; echo ERR); echo OK' 'OK' - echeck '(set -e; false false; echo ERR); echo OK' 'OK' + echeck '(set -e; false false; echo ERR); echo OK' 'ERR OK' echeck '(set -e; true false; echo ERR); echo OK' 'OK' # A failure that is not reached because of short-circuit @@ -174,8 +174,8 @@ # combined case with () and ; the inner expression is false # but does not itself exit, and the () should not cause an # exit even when failing. - dcheck '(set -e; (false true); echo OK); echo OK' 'OK OK' - echeck '(set -e; (false true); echo OK); echo OK' 'OK OK' + dcheck '(set -e; (false true); echo OK); echo OK' 'OK' + echeck '(set -e; (false true); echo OK); echo OK' 'OK' # pipelines. only the right-hand end is significant. dcheck '(set -e; false | true; echo OK); echo OK' 'OK OK' @@ -203,8 +203,8 @@ dcheck 'echo OK; (set -e; false); echo OK' 'OK OK' echeck 'echo OK; (set -e; false); echo OK' 'OK OK' # 2. error if the whole shell does not exit (dsl's suggested behavior) - dcheck 'echo OK; (set -e; false); echo ERR' 'OK' - echeck 'echo OK; (set -e; false); echo ERR' 'OK' + dcheck 'echo OK; (set -e; false); echo ERR' 'OK ERR' + echeck 'echo OK; (set -e; false); echo ERR' 'OK ERR' # The current behavior of the shell is that it exits out as # far as -e is set and then stops. This is probably a @@ -214,26 +214,26 @@ echeck '(set -e; (false; echo ERR); echo ERR); echo OK' 'OK' # backquote expansion (PR bin/17514) - dcheck '(set -e; echo ERR `false`; echo ERR); echo OK' 'OK' - dcheck '(set -e; echo ERR $(false); echo ERR); echo OK' 'OK' - dcheck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'OK' - dcheck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'OK' + dcheck '(set -e; echo ERR `false`; echo ERR); echo OK' 'ERR ERR OK' + dcheck '(set -e; echo ERR $(false); echo ERR); echo OK' 'ERR ERR OK' + dcheck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'ERR ERR OK' + dcheck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'ERR ERR OK' dcheck '(set -e; x=`false`; echo ERR); echo OK' 'OK' dcheck '(set -e; x=$(false); echo ERR); echo OK' 'OK' dcheck '(set -e; x=`exit 3`; echo ERR); echo OK' 'OK' dcheck '(set -e; x=$(exit 3); echo ERR); echo OK' 'OK' - echeck '(set -e; echo ERR `false`; echo ERR); echo OK' 'OK' - echeck '(set -e; echo ERR $(false); echo ERR); echo OK' 'OK' - echeck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'OK' - echeck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'OK' + echeck '(set -e; echo ERR `false`; echo ERR); echo OK' 'ERR ERR OK' + echeck '(set -e; echo ERR $(false); echo ERR); echo OK' 'ERR ERR OK' + echeck '(set -e; echo ERR `exit 3`; echo ERR); echo OK' 'ERR ERR OK' + echeck '(set -e; echo ERR $(exit 3); echo ERR); echo OK' 'ERR ERR OK' echeck '(set -e; x=`false`; echo ERR); echo OK' 'OK' echeck '(set -e; x=$(false); echo ERR); echo OK' 'OK' echeck '(set -e; x=`exit 3`; echo ERR); echo OK' 'OK' echeck '(set -e; x=$(exit 3); echo ERR); echo OK' 'OK' # shift (PR bin/37493) - dcheck '(set -e; shift || true; echo OK); echo OK' 'OK OK' - echeck '(set -e; shift || true; echo OK); echo OK' 'OK OK' + dcheck '(set -e; shift || true; echo OK); echo OK' 'OK' + echeck '(set -e; shift || true; echo OK); echo OK' 'OK' # Done.
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Tue Oct 20 21:58:35 UTC 2009
Modified Files:
src/tests/util/sh: Makefile t_expand.sh
Added Files:
src/tests/util/sh: t_exit.sh t_wait.sh
Removed Files:
src/tests/util/sh: t_exitstatus.sh
Log Message:
Migrate three sh test cases from regress to tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/sh/t_exit.sh \
src/tests/util/sh/t_wait.sh
cvs rdiff -u -r1.2 -r0 src/tests/util/sh/t_exitstatus.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/Makefile
diff -u src/tests/util/sh/Makefile:1.2 src/tests/util/sh/Makefile:1.3
--- src/tests/util/sh/Makefile:1.2 Wed Nov 21 15:39:35 2007
+++ src/tests/util/sh/Makefile Tue Oct 20 21:58:35 2009
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/11/21 15:39:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/20 21:58:35 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util/sh
TESTS_SH= t_compexit
-TESTS_SH+= t_exitstatus
+TESTS_SH+= t_exit
TESTS_SH+= t_expand
TESTS_SH+= t_fsplit
TESTS_SH+= t_here
TESTS_SH+= t_set_e
TESTS_SH+= t_varquote
+TESTS_SH+= t_wait
.include bsd.test.mk
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.3 src/tests/util/sh/t_expand.sh:1.4
--- src/tests/util/sh/t_expand.sh:1.3 Wed Oct 14 13:02:03 2009
+++ src/tests/util/sh/t_expand.sh Tue Oct 20 21:58:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.3 2009/10/14 13:02:03 jmmv Exp $
+# $NetBSD: t_expand.sh,v 1.4 2009/10/20 21:58:35 jmmv Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -94,6 +94,17 @@
atf_check_equal '$stripped' '${line%%/\**}'
}
+atf_test_case varpattern_backslashes
+varpattern_backslashes_head() {
+ atf_set descr Tests that protecting wildcards with backslashes \
+ works in variable patterns.
+}
+varpattern_backslashes_body() {
+ line='/foo/bar/*/baz'
+ stripped='/foo/bar/'
+ atf_check_equal $stripped ${line%%\**}
+}
+
atf_test_case arithmetic
arithmetic_head() {
atf_set descr POSIX requires shell arithmetic to use signed \
@@ -111,5 +122,6 @@
atf_add_test_case dollar_at
atf_add_test_case dollar_at_with_text
atf_add_test_case strip
+ atf_add_test_case varpattern_backslashes
atf_add_test_case arithmetic
}
Added files:
Index: src/tests/util/sh/t_exit.sh
diff -u /dev/null src/tests/util/sh/t_exit.sh:1.1
--- /dev/null Tue Oct 20 21:58:35 2009
+++ src/tests/util/sh/t_exit.sh Tue Oct 20 21:58:35 2009
@@ -0,0 +1,69 @@
+# $NetBSD: t_exit.sh,v 1.1 2009/10/20 21:58:35 jmmv Exp $
+#
+# 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.
+#
+# 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.
+#
+
+crud() {
+ test yes = no
+
+ cat EOF
+$?
+EOF
+}
+
+atf_test_case function
+function_head() {
+ atf_set descr Tests that \$? is correctly updated inside \
+ a function
+}
+function_body() {
+ foo=`crud`
+ atf_check_equal 'x$foo' 'x1'
+}
+
+atf_test_case readout
+readout_head() {
+ atf_set descr Tests that \$? is correctly updated in a \
+ compound expression
+}
+readout_body() {
+ atf_check_equal '$( true ! true | false; echo $? )' '0'
+}
+
+atf_test_case trap_subshell
+trap_subshell_head() {
+ atf_set descr Tests that the trap statement in a subshell \
+ works when the subshell exits
+}
+trap_subshell_body() {
+ atf_check -s eq:0 -o inline:'exiting\n' -x \
+ '( trap echo exiting EXIT; /usr/bin/true )'
+}
+
+atf_init_test_cases() {
+ atf_add_test_case function
+
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Wed Oct 14 13:02:04 UTC 2009
Modified Files:
src/tests/util/sh: t_expand.sh
Log Message:
Add test cases for prefix $@ suffix expansion. From PR bin/33956.
This issue was fixed a while ago but the tests described in the report
were never written as proper test cases.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.2 src/tests/util/sh/t_expand.sh:1.3
--- src/tests/util/sh/t_expand.sh:1.2 Wed Apr 30 13:11:00 2008
+++ src/tests/util/sh/t_expand.sh Wed Oct 14 13:02:03 2009
@@ -1,6 +1,6 @@
-# $NetBSD: t_expand.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_expand.sh,v 1.3 2009/10/14 13:02:03 jmmv Exp $
#
-# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,19 @@
# This file tests the functions in expand.c.
#
+delim_argv() {
+ str=
+ while [ $# -gt 0 ]; do
+ if [ -z ${str} ]; then
+ str=$1
+ else
+ str=${str} $1
+ fi
+shift
+ done
+ echo ${str}
+}
+
atf_test_case dollar_at
dollar_at_head() {
atf_set descr Somewhere between 2.0.2 and 3.0 the expansion \
@@ -52,6 +65,23 @@
atf_check_equal '0' '$n_args'
}
+atf_test_case dollar_at_with_text
+dollar_at_with_text_head() {
+ atf_set descr Test \$@ expansion when it is surrounded by text \
+ within the quotes. PR bin/33956.
+}
+dollar_at_with_text_body() {
+ set --
+ atf_check_equal '' $(delim_argv $@)
+ atf_check_equal 'foobar' $(delim_argv f...@bar)
+ atf_check_equal 'foo bar' $(delim_argv foo $@ bar)
+
+ set -- a b c
+ atf_check_equal 'a b c' $(delim_argv $@)
+ atf_check_equal 'fooa b cbar' $(delim_argv f...@bar)
+ atf_check_equal 'foo a b c bar' $(delim_argv foo $@ bar)
+}
+
atf_test_case strip
strip_head() {
atf_set descr Checks that the %% operator works and strips \
@@ -79,6 +109,7 @@
atf_init_test_cases() {
atf_add_test_case dollar_at
+ atf_add_test_case dollar_at_with_text
atf_add_test_case strip
atf_add_test_case arithmetic
}
CVS commit: src/tests/util/mtree
Module Name:src
Committed By: apb
Date: Sat Sep 19 20:37:05 UTC 2009
Modified Files:
src/tests/util/mtree: Makefile t_mtree.sh
Added Files:
src/tests/util/mtree: d_merge.in d_merge_C_M.out d_merge_C_M_S.out
Log Message:
Add tests for the mtree -M issue reported in PR 42031 from Geoff Wing.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/mtree/Makefile \
src/tests/util/mtree/t_mtree.sh
cvs rdiff -u -r0 -r1.1 src/tests/util/mtree/d_merge.in \
src/tests/util/mtree/d_merge_C_M.out \
src/tests/util/mtree/d_merge_C_M_S.out
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/mtree/Makefile
diff -u src/tests/util/mtree/Makefile:1.3 src/tests/util/mtree/Makefile:1.4
--- src/tests/util/mtree/Makefile:1.3 Wed Apr 8 19:06:30 2009
+++ src/tests/util/mtree/Makefile Sat Sep 19 20:37:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/08 19:06:30 apb Exp $
+# $NetBSD: Makefile,v 1.4 2009/09/19 20:37:05 apb Exp $
NOMAN= # defined
@@ -15,5 +15,9 @@
FILES+= d_convert_D.out
FILES+= d_convert_D_S.out
FILES+= d_create.out
+FILES+= d_merge.1.in
+FILES+= d_merge.1.out
+FILES+= d_merge.2.in
+FILES+= d_merge.2.out
.include bsd.test.mk
Index: src/tests/util/mtree/t_mtree.sh
diff -u src/tests/util/mtree/t_mtree.sh:1.3 src/tests/util/mtree/t_mtree.sh:1.4
--- src/tests/util/mtree/t_mtree.sh:1.3 Wed Apr 8 19:06:30 2009
+++ src/tests/util/mtree/t_mtree.sh Sat Sep 19 20:37:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtree.sh,v 1.3 2009/04/08 19:06:30 apb Exp $
+# $NetBSD: t_mtree.sh,v 1.4 2009/09/19 20:37:05 apb Exp $
#
# Copyright (c) 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -143,6 +143,20 @@
h_check $(atf_get_srcdir)/d_convert_D_S.out output
}
+atf_test_case merge
+merge_head()
+{
+ atf_set descr Merge records of different type
+}
+merge_body()
+{
+ mtree -C -M -K all $(atf_get_srcdir)/d_merge.in output
+ h_check $(atf_get_srcdir)/d_merge_C_M.out output
+ # same again, with sorting
+ mtree -C -M -S -K all $(atf_get_srcdir)/d_merge.in output
+ h_check $(atf_get_srcdir)/d_merge_C_M_S.out output
+}
+
atf_init_test_cases()
{
atf_add_test_case create
@@ -151,4 +165,5 @@
atf_add_test_case convert_C_S
atf_add_test_case convert_D
atf_add_test_case convert_D_S
+ atf_add_test_case merge
}
Added files:
Index: src/tests/util/mtree/d_merge.in
diff -u /dev/null src/tests/util/mtree/d_merge.in:1.1
--- /dev/null Sat Sep 19 20:37:05 2009
+++ src/tests/util/mtree/d_merge.in Sat Sep 19 20:37:05 2009
@@ -0,0 +1,27 @@
+# The last entry for any duplicate node should take precedence.
+
+. type=dir
+
+# directory a with only one entry, changing from dir to link
+./a type=dir
+./a/change-dir-to-link type=dir mode=0755
+./a/change-dir-to-link type=link mode=0755
+
+# directory b with only one entry, changing from link to dir
+./b type=dir
+./b/change-link-to-dir type=link mode=0755
+./b/change-link-to-dir type=dir mode=0755
+
+# directory c with multiple entries, one changing from dir to link
+./c type=dir
+./c/aaa type=file
+./c/zzz type=file
+./c/change-dir-to-link type=dir mode=0755
+./c/change-dir-to-link type=link mode=0755
+
+# directory d with multiple entries, one changing from link to dir
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=link mode=0755
+./d/change-link-to-dir type=dir mode=0755
Index: src/tests/util/mtree/d_merge_C_M.out
diff -u /dev/null src/tests/util/mtree/d_merge_C_M.out:1.1
--- /dev/null Sat Sep 19 20:37:05 2009
+++ src/tests/util/mtree/d_merge_C_M.out Sat Sep 19 20:37:05 2009
@@ -0,0 +1,13 @@
+. type=dir
+./a type=dir
+./a/change-dir-to-link type=link mode=0755
+./b type=dir
+./b/change-link-to-dir type=dir mode=0755
+./c type=dir
+./c/aaa type=file
+./c/zzz type=file
+./c/change-dir-to-link type=link mode=0755
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=dir mode=0755
Index: src/tests/util/mtree/d_merge_C_M_S.out
diff -u /dev/null src/tests/util/mtree/d_merge_C_M_S.out:1.1
--- /dev/null Sat Sep 19 20:37:05 2009
+++ src/tests/util/mtree/d_merge_C_M_S.out Sat Sep 19 20:37:05 2009
@@ -0,0 +1,13 @@
+. type=dir
+./a type=dir
+./a/change-dir-to-link type=link mode=0755
+./b type=dir
+./b/change-link-to-dir type=dir mode=0755
+./c type=dir
+./c/aaa type=file
+./c/change-dir-to-link type=link mode=0755
+./c/zzz type=file
+./d type=dir
+./d/aaa type=file
+./d/zzz type=file
+./d/change-link-to-dir type=dir mode=0755
CVS commit: src/tests/util/mtree
Module Name:src Committed By: apb Date: Sat Sep 19 21:42:26 UTC 2009 Modified Files: src/tests/util/mtree: d_convert_C.out d_convert_C_S.out d_merge_C_M.out d_merge_C_M_S.out Log Message: Adjust tests to no longer expect a trailing space in each line of output from mtree -C. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/util/mtree/d_convert_C.out cvs rdiff -u -r1.1 -r1.2 src/tests/util/mtree/d_convert_C_S.out \ src/tests/util/mtree/d_merge_C_M.out \ src/tests/util/mtree/d_merge_C_M_S.out Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/mtree/d_convert_C.out diff -u src/tests/util/mtree/d_convert_C.out:1.2 src/tests/util/mtree/d_convert_C.out:1.3 --- src/tests/util/mtree/d_convert_C.out:1.2 Wed Apr 8 19:06:30 2009 +++ src/tests/util/mtree/d_convert_C.out Sat Sep 19 21:42:26 2009 @@ -1,14 +1,14 @@ -. type=dir -./a.symlink.1 type=link link=a.file.1 -./top.dangling type=link link=nonexistent -./top.symlink.b type=link link=b -./b type=dir -./b/b.file.2 type=file -./b/b.file.1 type=file -./top.file.1 type=file -./a type=dir -./a/a.file.2 type=file -./a/1 type=dir -./a/1/a1.file.1 type=file -./a/a.file.1 type=file -./a/2 type=dir +. type=dir +./a.symlink.1 type=link link=a.file.1 +./top.dangling type=link link=nonexistent +./top.symlink.b type=link link=b +./b type=dir +./b/b.file.2 type=file +./b/b.file.1 type=file +./top.file.1 type=file +./a type=dir +./a/a.file.2 type=file +./a/1 type=dir +./a/1/a1.file.1 type=file +./a/a.file.1 type=file +./a/2 type=dir Index: src/tests/util/mtree/d_convert_C_S.out diff -u src/tests/util/mtree/d_convert_C_S.out:1.1 src/tests/util/mtree/d_convert_C_S.out:1.2 --- src/tests/util/mtree/d_convert_C_S.out:1.1 Wed Apr 8 19:06:30 2009 +++ src/tests/util/mtree/d_convert_C_S.out Sat Sep 19 21:42:26 2009 @@ -1,14 +1,14 @@ -. type=dir -./a.symlink.1 type=link link=a.file.1 -./top.dangling type=link link=nonexistent -./top.file.1 type=file -./top.symlink.b type=link link=b -./a type=dir -./a/a.file.1 type=file -./a/a.file.2 type=file -./a/1 type=dir -./a/1/a1.file.1 type=file -./a/2 type=dir -./b type=dir -./b/b.file.1 type=file -./b/b.file.2 type=file +. type=dir +./a.symlink.1 type=link link=a.file.1 +./top.dangling type=link link=nonexistent +./top.file.1 type=file +./top.symlink.b type=link link=b +./a type=dir +./a/a.file.1 type=file +./a/a.file.2 type=file +./a/1 type=dir +./a/1/a1.file.1 type=file +./a/2 type=dir +./b type=dir +./b/b.file.1 type=file +./b/b.file.2 type=file Index: src/tests/util/mtree/d_merge_C_M.out diff -u src/tests/util/mtree/d_merge_C_M.out:1.1 src/tests/util/mtree/d_merge_C_M.out:1.2 --- src/tests/util/mtree/d_merge_C_M.out:1.1 Sat Sep 19 20:37:05 2009 +++ src/tests/util/mtree/d_merge_C_M.out Sat Sep 19 21:42:26 2009 @@ -1,13 +1,13 @@ -. type=dir -./a type=dir -./a/change-dir-to-link type=link mode=0755 -./b type=dir -./b/change-link-to-dir type=dir mode=0755 -./c type=dir -./c/aaa type=file -./c/zzz type=file -./c/change-dir-to-link type=link mode=0755 -./d type=dir -./d/aaa type=file -./d/zzz type=file -./d/change-link-to-dir type=dir mode=0755 +. type=dir +./a type=dir +./a/change-dir-to-link type=link mode=0755 +./b type=dir +./b/change-link-to-dir type=dir mode=0755 +./c type=dir +./c/aaa type=file +./c/zzz type=file +./c/change-dir-to-link type=link mode=0755 +./d type=dir +./d/aaa type=file +./d/zzz type=file +./d/change-link-to-dir type=dir mode=0755 Index: src/tests/util/mtree/d_merge_C_M_S.out diff -u src/tests/util/mtree/d_merge_C_M_S.out:1.1 src/tests/util/mtree/d_merge_C_M_S.out:1.2 --- src/tests/util/mtree/d_merge_C_M_S.out:1.1 Sat Sep 19 20:37:05 2009 +++ src/tests/util/mtree/d_merge_C_M_S.out Sat Sep 19 21:42:26 2009 @@ -1,13 +1,13 @@ -. type=dir -./a type=dir -./a/change-dir-to-link type=link mode=0755 -./b type=dir -./b/change-link-to-dir type=dir mode=0755 -./c type=dir -./c/aaa type=file -./c/change-dir-to-link type=link mode=0755 -./c/zzz type=file -./d type=dir -./d/aaa type=file -./d/zzz type=file -./d/change-link-to-dir type=dir mode=0755 +. type=dir +./a type=dir +./a/change-dir-to-link type=link mode=0755 +./b type=dir +./b/change-link-to-dir type=dir mode=0755 +./c type=dir +./c/aaa type=file +./c/change-dir-to-link type=link mode=0755 +./c/zzz type=file +./d type=dir +./d/aaa type=file +./d/zzz type=file +./d/change-link-to-dir type=dir mode=0755
CVS commit: src/tests/util/mtree
Module Name:src Committed By: apb Date: Sat Sep 19 21:49:50 UTC 2009 Modified Files: src/tests/util/mtree: Makefile Log Message: Correct list of d_merge* files. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/util/mtree/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/util/mtree/Makefile diff -u src/tests/util/mtree/Makefile:1.4 src/tests/util/mtree/Makefile:1.5 --- src/tests/util/mtree/Makefile:1.4 Sat Sep 19 20:37:05 2009 +++ src/tests/util/mtree/Makefile Sat Sep 19 21:49:50 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/09/19 20:37:05 apb Exp $ +# $NetBSD: Makefile,v 1.5 2009/09/19 21:49:50 apb Exp $ NOMAN= # defined @@ -15,9 +15,8 @@ FILES+= d_convert_D.out FILES+= d_convert_D_S.out FILES+= d_create.out -FILES+= d_merge.1.in -FILES+= d_merge.1.out -FILES+= d_merge.2.in -FILES+= d_merge.2.out +FILES+= d_merge.in +FILES+= d_merge_C_M.out +FILES+= d_merge_C_M_S.out .include bsd.test.mk
