Module Name: src
Committed By: rillig
Date: Sat Oct 23 20:23:27 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/indent: Makefile
Added Files:
src/tests/usr.bin/indent: opt_version.c
Removed Files:
src/tests/usr.bin/indent: opt--version.0 opt--version.0.pro
opt--version.0.stdout
Log Message:
tests/indent: migrate test for '--version' to t_options
To generate a diff of this commit:
cvs rdiff -u -r1.1158 -r1.1159 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.30 -r1.31 src/tests/usr.bin/indent/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/usr.bin/indent/opt--version.0
cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/indent/opt--version.0.pro \
src/tests/usr.bin/indent/opt--version.0.stdout
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/indent/opt_version.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1158 src/distrib/sets/lists/tests/mi:1.1159
--- src/distrib/sets/lists/tests/mi:1.1158 Sat Oct 23 20:17:08 2021
+++ src/distrib/sets/lists/tests/mi Sat Oct 23 20:23:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1158 2021/10/23 20:17:08 rillig Exp $
+# $NetBSD: mi,v 1.1159 2021/10/23 20:23:27 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4789,9 +4789,9 @@
./usr/tests/usr.bin/indent/ncs.0.stdout tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/offsetof.0 tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/offsetof.0.stdout tests-obsolete obsolete,atf
-./usr/tests/usr.bin/indent/opt--version.0 tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/indent/opt--version.0.pro tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/indent/opt--version.0.stdout tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/indent/opt--version.0 tests-obsolete obsolete,atf
+./usr/tests/usr.bin/indent/opt--version.0.pro tests-obsolete obsolete,atf
+./usr/tests/usr.bin/indent/opt--version.0.stdout tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/opt-P.0 tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/opt-P.0.pro tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/opt-P.0.stdout tests-obsolete obsolete,atf
@@ -5043,6 +5043,7 @@
./usr/tests/usr.bin/indent/opt_ts.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/indent/opt_ut.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/indent/opt_v.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/indent/opt_version.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/indent/parens.0 tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/parens.0.pro tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/parens.0.stdout tests-obsolete obsolete,atf
Index: src/tests/usr.bin/indent/Makefile
diff -u src/tests/usr.bin/indent/Makefile:1.30 src/tests/usr.bin/indent/Makefile:1.31
--- src/tests/usr.bin/indent/Makefile:1.30 Sat Oct 23 20:17:08 2021
+++ src/tests/usr.bin/indent/Makefile Sat Oct 23 20:23:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/10/23 20:17:08 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2021/10/23 20:23:27 rillig Exp $
.include <bsd.own.mk>
@@ -18,9 +18,6 @@ FILES+= label.c
FILES+= lex_ident.c
FILES+= lex_char.c
FILES+= lex_string.c
-FILES+= opt--version.0
-FILES+= opt--version.0.pro
-FILES+= opt--version.0.stdout
FILES+= opt-U.0
FILES+= opt-U.0.list
FILES+= opt-U.0.pro
@@ -74,6 +71,7 @@ FILES+= opt_ta.c
FILES+= opt_ts.c
FILES+= opt_ut.c
FILES+= opt_v.c
+FILES+= opt_version.c
FILES+= ps_ind_level.c
FILES+= t_options.awk
FILES+= token_binary_op.c
Added files:
Index: src/tests/usr.bin/indent/opt_version.c
diff -u /dev/null src/tests/usr.bin/indent/opt_version.c:1.1
--- /dev/null Sat Oct 23 20:23:28 2021
+++ src/tests/usr.bin/indent/opt_version.c Sat Oct 23 20:23:27 2021
@@ -0,0 +1,17 @@
+/* $NetBSD: opt_version.c,v 1.1 2021/10/23 20:23:27 rillig Exp $ */
+/* $FreeBSD$ */
+
+/*
+ * Tests for the option '--version', which outputs the program version and
+ * exits immediately.
+ */
+
+#indent input
+When the option '--version' is given, any other options are ignored.
+Therefore the source file, if given, can contain arbitrary text that
+even might generate syntax errors when given to a C compiler.
+#indent end
+
+#indent run --version
+FreeBSD indent 2.0
+#indent end
