summaryrefslogtreecommitdiffstats
path: root/usr.bin/ncal
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2014-03-16 08:04:06 +0000
committerjmmv <jmmv@FreeBSD.org>2014-03-16 08:04:06 +0000
commit41a8d8c29552ddd9098cfb09a71927f503a28371 (patch)
treea434fba265da51ef79b1cfc4461e1080dbe53e90 /usr.bin/ncal
parentb2e51e38a88412c17ce1160c247a6d673c0b2147 (diff)
downloadFreeBSD-src-41a8d8c29552ddd9098cfb09a71927f503a28371.zip
FreeBSD-src-41a8d8c29552ddd9098cfb09a71927f503a28371.tar.gz
Migrate most of tools/regression/usr.bin/ to the new tests layout.
I'm starting with the easy cases. The leftovers need to be looked at a bit more closely. Note that this change _does_ modify the code of the old tests. This is required in order to allow the code to locate the data files in the source directory instead of the current directory, because Kyua automatically changes the latter to a temporary directory. Also note that at least one test is known to be broken here. Actually, the test is not really broken: it's marked as a TODO but unfortunately Kyua's TAP parser currently does not understand that. Will have to be fixed separately.
Diffstat (limited to 'usr.bin/ncal')
-rw-r--r--usr.bin/ncal/Makefile6
-rw-r--r--usr.bin/ncal/tests/Makefile99
-rw-r--r--usr.bin/ncal/tests/legacy_test.sh6
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200901-jd-nhl.out17
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200901-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200902-jd-nhl.out18
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200902-md-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200903-jd-nhl.out17
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200903-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200904-jd-nhl.out18
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200904-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200905-jd-nhl.out17
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200905-md-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200906-jd-nhl.out18
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200906-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200907-jd-nhl.out17
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200907-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200908-jd-nhl.out18
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200908-md-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200909-jd-nhl.out17
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200909-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200910-jd-nhl.out18
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200910-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200911-jd-nhl.out17
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200911-md-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200912-jd-nhl.out19
-rw-r--r--usr.bin/ncal/tests/regress.b-3m200912-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.b-y2008-jd-nhl.out54
-rw-r--r--usr.bin/ncal/tests/regress.b-y2008-md-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.b-y2009-jd-nhl.out54
-rw-r--r--usr.bin/ncal/tests/regress.b-y2009-md-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.b-y2010-jd-nhl.out54
-rw-r--r--usr.bin/ncal/tests/regress.b-y2010-md-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.b-y2011-jd-nhl.out54
-rw-r--r--usr.bin/ncal/tests/regress.b-y2011-md-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.f-3A-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-3AB-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-3B-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-3gy-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-3y-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-mgm-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-yA-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-yAB-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-yB-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-ygm-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.f-ym-nhl.out1
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200901-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200901-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200902-jd-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200902-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200903-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200903-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200904-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200904-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200905-jd-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200905-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200906-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200906-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200907-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200907-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200908-jd-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200908-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200909-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200909-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200910-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200910-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200911-jd-nhl.out9
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200911-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200912-jd-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-3m200912-md-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.r-y2008-jd-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.r-y2008-md-nhl.out27
-rw-r--r--usr.bin/ncal/tests/regress.r-y2009-jd-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.r-y2009-md-nhl.out27
-rw-r--r--usr.bin/ncal/tests/regress.r-y2010-jd-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.r-y2010-md-nhl.out27
-rw-r--r--usr.bin/ncal/tests/regress.r-y2011-jd-nhl.out36
-rw-r--r--usr.bin/ncal/tests/regress.r-y2011-md-nhl.out27
-rw-r--r--usr.bin/ncal/tests/regress.s-b-3-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-b-A-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-b-AB-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-b-B-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-b-gmgy-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-b-m-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-b-mgy-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-3-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-A-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-AB-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-B-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-gmgy-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-m-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.s-r-mgy-nhl.out8
-rw-r--r--usr.bin/ncal/tests/regress.sh80
93 files changed, 1433 insertions, 0 deletions
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 7d42921..27aa567 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= ncal
DPADD= ${LIBCALENDAR} ${LIBTERMCAP}
@@ -8,4 +10,8 @@ LDADD= -lcalendar -ltermcap
LINKS= ${BINDIR}/ncal ${BINDIR}/cal
MLINKS= ncal.1 cal.1
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
diff --git a/usr.bin/ncal/tests/Makefile b/usr.bin/ncal/tests/Makefile
new file mode 100644
index 0000000..170caac
--- /dev/null
+++ b/usr.bin/ncal/tests/Makefile
@@ -0,0 +1,99 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/usr.bin/ncal
+
+TAP_TESTS_SH= legacy_test
+
+FILESDIR= ${TESTSDIR}
+FILES= regress.b-3m200901-jd-nhl.out
+FILES+= regress.b-3m200901-md-nhl.out
+FILES+= regress.b-3m200902-jd-nhl.out
+FILES+= regress.b-3m200902-md-nhl.out
+FILES+= regress.b-3m200903-jd-nhl.out
+FILES+= regress.b-3m200903-md-nhl.out
+FILES+= regress.b-3m200904-jd-nhl.out
+FILES+= regress.b-3m200904-md-nhl.out
+FILES+= regress.b-3m200905-jd-nhl.out
+FILES+= regress.b-3m200905-md-nhl.out
+FILES+= regress.b-3m200906-jd-nhl.out
+FILES+= regress.b-3m200906-md-nhl.out
+FILES+= regress.b-3m200907-jd-nhl.out
+FILES+= regress.b-3m200907-md-nhl.out
+FILES+= regress.b-3m200908-jd-nhl.out
+FILES+= regress.b-3m200908-md-nhl.out
+FILES+= regress.b-3m200909-jd-nhl.out
+FILES+= regress.b-3m200909-md-nhl.out
+FILES+= regress.b-3m200910-jd-nhl.out
+FILES+= regress.b-3m200910-md-nhl.out
+FILES+= regress.b-3m200911-jd-nhl.out
+FILES+= regress.b-3m200911-md-nhl.out
+FILES+= regress.b-3m200912-jd-nhl.out
+FILES+= regress.b-3m200912-md-nhl.out
+FILES+= regress.b-y2008-jd-nhl.out
+FILES+= regress.b-y2008-md-nhl.out
+FILES+= regress.b-y2009-jd-nhl.out
+FILES+= regress.b-y2009-md-nhl.out
+FILES+= regress.b-y2010-jd-nhl.out
+FILES+= regress.b-y2010-md-nhl.out
+FILES+= regress.b-y2011-jd-nhl.out
+FILES+= regress.b-y2011-md-nhl.out
+FILES+= regress.f-3A-nhl.out
+FILES+= regress.f-3AB-nhl.out
+FILES+= regress.f-3B-nhl.out
+FILES+= regress.f-3gy-nhl.out
+FILES+= regress.f-3y-nhl.out
+FILES+= regress.f-mgm-nhl.out
+FILES+= regress.f-yA-nhl.out
+FILES+= regress.f-yAB-nhl.out
+FILES+= regress.f-yB-nhl.out
+FILES+= regress.f-ygm-nhl.out
+FILES+= regress.f-ym-nhl.out
+FILES+= regress.r-3m200901-jd-nhl.out
+FILES+= regress.r-3m200901-md-nhl.out
+FILES+= regress.r-3m200902-jd-nhl.out
+FILES+= regress.r-3m200902-md-nhl.out
+FILES+= regress.r-3m200903-jd-nhl.out
+FILES+= regress.r-3m200903-md-nhl.out
+FILES+= regress.r-3m200904-jd-nhl.out
+FILES+= regress.r-3m200904-md-nhl.out
+FILES+= regress.r-3m200905-jd-nhl.out
+FILES+= regress.r-3m200905-md-nhl.out
+FILES+= regress.r-3m200906-jd-nhl.out
+FILES+= regress.r-3m200906-md-nhl.out
+FILES+= regress.r-3m200907-jd-nhl.out
+FILES+= regress.r-3m200907-md-nhl.out
+FILES+= regress.r-3m200908-jd-nhl.out
+FILES+= regress.r-3m200908-md-nhl.out
+FILES+= regress.r-3m200909-jd-nhl.out
+FILES+= regress.r-3m200909-md-nhl.out
+FILES+= regress.r-3m200910-jd-nhl.out
+FILES+= regress.r-3m200910-md-nhl.out
+FILES+= regress.r-3m200911-jd-nhl.out
+FILES+= regress.r-3m200911-md-nhl.out
+FILES+= regress.r-3m200912-jd-nhl.out
+FILES+= regress.r-3m200912-md-nhl.out
+FILES+= regress.r-y2008-jd-nhl.out
+FILES+= regress.r-y2008-md-nhl.out
+FILES+= regress.r-y2009-jd-nhl.out
+FILES+= regress.r-y2009-md-nhl.out
+FILES+= regress.r-y2010-jd-nhl.out
+FILES+= regress.r-y2010-md-nhl.out
+FILES+= regress.r-y2011-jd-nhl.out
+FILES+= regress.r-y2011-md-nhl.out
+FILES+= regress.s-b-3-nhl.out
+FILES+= regress.s-b-A-nhl.out
+FILES+= regress.s-b-AB-nhl.out
+FILES+= regress.s-b-B-nhl.out
+FILES+= regress.s-b-gmgy-nhl.out
+FILES+= regress.s-b-m-nhl.out
+FILES+= regress.s-b-mgy-nhl.out
+FILES+= regress.s-r-3-nhl.out
+FILES+= regress.s-r-A-nhl.out
+FILES+= regress.s-r-AB-nhl.out
+FILES+= regress.s-r-B-nhl.out
+FILES+= regress.s-r-gmgy-nhl.out
+FILES+= regress.s-r-m-nhl.out
+FILES+= regress.s-r-mgy-nhl.out
+FILES+= regress.sh
+
+.include <bsd.test.mk>
diff --git a/usr.bin/ncal/tests/legacy_test.sh b/usr.bin/ncal/tests/legacy_test.sh
new file mode 100644
index 0000000..1b6b806
--- /dev/null
+++ b/usr.bin/ncal/tests/legacy_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+SRCDIR="$(dirname "${0}")"; export SRCDIR
+
+m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/usr.bin/ncal/tests/regress.b-3m200901-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200901-jd-nhl.out
new file mode 100644
index 0000000..65d3619
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200901-jd-nhl.out
@@ -0,0 +1,17 @@
+ December 2008 January 2009
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 336 337 338 339 340 341 1 2 3
+342 343 344 345 346 347 348 4 5 6 7 8 9 10
+349 350 351 352 353 354 355 11 12 13 14 15 16 17
+356 357 358 359 360 361 362 18 19 20 21 22 23 24
+363 364 365 366 25 26 27 28 29 30 31
+
+
+ February 2009
+ Su Mo Tu We Th Fr Sa
+ 32 33 34 35 36 37 38
+ 39 40 41 42 43 44 45
+ 46 47 48 49 50 51 52
+ 53 54 55 56 57 58 59
+
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200901-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200901-md-nhl.out
new file mode 100644
index 0000000..afbdde1
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200901-md-nhl.out
@@ -0,0 +1,8 @@
+ December 2008 January 2009 February 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6 1 2 3 1 2 3 4 5 6 7
+ 7 8 9 10 11 12 13 4 5 6 7 8 9 10 8 9 10 11 12 13 14
+14 15 16 17 18 19 20 11 12 13 14 15 16 17 15 16 17 18 19 20 21
+21 22 23 24 25 26 27 18 19 20 21 22 23 24 22 23 24 25 26 27 28
+28 29 30 31 25 26 27 28 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200902-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200902-jd-nhl.out
new file mode 100644
index 0000000..33f614d
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200902-jd-nhl.out
@@ -0,0 +1,18 @@
+ 2009
+ January February
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 32 33 34 35 36 37 38
+ 4 5 6 7 8 9 10 39 40 41 42 43 44 45
+ 11 12 13 14 15 16 17 46 47 48 49 50 51 52
+ 18 19 20 21 22 23 24 53 54 55 56 57 58 59
+ 25 26 27 28 29 30 31
+
+
+ March
+ Su Mo Tu We Th Fr Sa
+ 60 61 62 63 64 65 66
+ 67 68 69 70 71 72 73
+ 74 75 76 77 78 79 80
+ 81 82 83 84 85 86 87
+ 88 89 90
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200902-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200902-md-nhl.out
new file mode 100644
index 0000000..e81b78e
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200902-md-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ January February March
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 6 7
+ 4 5 6 7 8 9 10 8 9 10 11 12 13 14 8 9 10 11 12 13 14
+11 12 13 14 15 16 17 15 16 17 18 19 20 21 15 16 17 18 19 20 21
+18 19 20 21 22 23 24 22 23 24 25 26 27 28 22 23 24 25 26 27 28
+25 26 27 28 29 30 31 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200903-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200903-jd-nhl.out
new file mode 100644
index 0000000..5974cbf
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200903-jd-nhl.out
@@ -0,0 +1,17 @@
+ February 2009 March 2009
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 32 33 34 35 36 37 38 60 61 62 63 64 65 66
+ 39 40 41 42 43 44 45 67 68 69 70 71 72 73
+ 46 47 48 49 50 51 52 74 75 76 77 78 79 80
+ 53 54 55 56 57 58 59 81 82 83 84 85 86 87
+ 88 89 90
+
+
+ April 2009
+ Su Mo Tu We Th Fr Sa
+ 91 92 93 94
+ 95 96 97 98 99 100 101
+102 103 104 105 106 107 108
+109 110 111 112 113 114 115
+116 117 118 119 120
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200903-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200903-md-nhl.out
new file mode 100644
index 0000000..4e9f0eb
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200903-md-nhl.out
@@ -0,0 +1,8 @@
+ February 2009 March 2009 April 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6 7 1 2 3 4 5 6 7 1 2 3 4
+ 8 9 10 11 12 13 14 8 9 10 11 12 13 14 5 6 7 8 9 10 11
+15 16 17 18 19 20 21 15 16 17 18 19 20 21 12 13 14 15 16 17 18
+22 23 24 25 26 27 28 22 23 24 25 26 27 28 19 20 21 22 23 24 25
+ 29 30 31 26 27 28 29 30
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200904-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200904-jd-nhl.out
new file mode 100644
index 0000000..d559f32
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200904-jd-nhl.out
@@ -0,0 +1,18 @@
+ 2009
+ March April
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 60 61 62 63 64 65 66 91 92 93 94
+ 67 68 69 70 71 72 73 95 96 97 98 99 100 101
+ 74 75 76 77 78 79 80 102 103 104 105 106 107 108
+ 81 82 83 84 85 86 87 109 110 111 112 113 114 115
+ 88 89 90 116 117 118 119 120
+
+
+ May
+ Su Mo Tu We Th Fr Sa
+ 121 122
+123 124 125 126 127 128 129
+130 131 132 133 134 135 136
+137 138 139 140 141 142 143
+144 145 146 147 148 149 150
+151
diff --git a/usr.bin/ncal/tests/regress.b-3m200904-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200904-md-nhl.out
new file mode 100644
index 0000000..0df9a75
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200904-md-nhl.out
@@ -0,0 +1,8 @@
+ March 2009 April 2009 May 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6 7 1 2 3 4 1 2
+ 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9
+15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16
+22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23
+29 30 31 26 27 28 29 30 24 25 26 27 28 29 30
+ 31
diff --git a/usr.bin/ncal/tests/regress.b-3m200905-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200905-jd-nhl.out
new file mode 100644
index 0000000..35d9c2b
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200905-jd-nhl.out
@@ -0,0 +1,17 @@
+ April 2009 May 2009
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 91 92 93 94 121 122
+ 95 96 97 98 99 100 101 123 124 125 126 127 128 129
+102 103 104 105 106 107 108 130 131 132 133 134 135 136
+109 110 111 112 113 114 115 137 138 139 140 141 142 143
+116 117 118 119 120 144 145 146 147 148 149 150
+ 151
+
+ June 2009
+ Su Mo Tu We Th Fr Sa
+ 152 153 154 155 156 157
+158 159 160 161 162 163 164
+165 166 167 168 169 170 171
+172 173 174 175 176 177 178
+179 180 181
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200905-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200905-md-nhl.out
new file mode 100644
index 0000000..3ee495d
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200905-md-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ April May June
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 1 2 1 2 3 4 5 6
+ 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13
+12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20
+19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27
+26 27 28 29 30 24 25 26 27 28 29 30 28 29 30
+ 31
diff --git a/usr.bin/ncal/tests/regress.b-3m200906-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200906-jd-nhl.out
new file mode 100644
index 0000000..47f95b0
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200906-jd-nhl.out
@@ -0,0 +1,18 @@
+ 2009
+ May June
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 121 122 152 153 154 155 156 157
+123 124 125 126 127 128 129 158 159 160 161 162 163 164
+130 131 132 133 134 135 136 165 166 167 168 169 170 171
+137 138 139 140 141 142 143 172 173 174 175 176 177 178
+144 145 146 147 148 149 150 179 180 181
+151
+
+ July
+ Su Mo Tu We Th Fr Sa
+ 182 183 184 185
+186 187 188 189 190 191 192
+193 194 195 196 197 198 199
+200 201 202 203 204 205 206
+207 208 209 210 211 212
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200906-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200906-md-nhl.out
new file mode 100644
index 0000000..a6c1dcd
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200906-md-nhl.out
@@ -0,0 +1,8 @@
+ May 2009 June 2009 July 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 2 3 4 5 6 1 2 3 4
+ 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11
+10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18
+17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25
+24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31
+31
diff --git a/usr.bin/ncal/tests/regress.b-3m200907-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200907-jd-nhl.out
new file mode 100644
index 0000000..9d96208
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200907-jd-nhl.out
@@ -0,0 +1,17 @@
+ June 2009 July 2009
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 152 153 154 155 156 157 182 183 184 185
+158 159 160 161 162 163 164 186 187 188 189 190 191 192
+165 166 167 168 169 170 171 193 194 195 196 197 198 199
+172 173 174 175 176 177 178 200 201 202 203 204 205 206
+179 180 181 207 208 209 210 211 212
+
+
+ August 2009
+ Su Mo Tu We Th Fr Sa
+ 213
+214 215 216 217 218 219 220
+221 222 223 224 225 226 227
+228 229 230 231 232 233 234
+235 236 237 238 239 240 241
+242 243
diff --git a/usr.bin/ncal/tests/regress.b-3m200907-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200907-md-nhl.out
new file mode 100644
index 0000000..9b762e2
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200907-md-nhl.out
@@ -0,0 +1,8 @@
+ June 2009 July 2009 August 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6 1 2 3 4 1
+ 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8
+14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15
+21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22
+28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29
+ 30 31
diff --git a/usr.bin/ncal/tests/regress.b-3m200908-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200908-jd-nhl.out
new file mode 100644
index 0000000..768de3f
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200908-jd-nhl.out
@@ -0,0 +1,18 @@
+ 2009
+ July August
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 182 183 184 185 213
+186 187 188 189 190 191 192 214 215 216 217 218 219 220
+193 194 195 196 197 198 199 221 222 223 224 225 226 227
+200 201 202 203 204 205 206 228 229 230 231 232 233 234
+207 208 209 210 211 212 235 236 237 238 239 240 241
+ 242 243
+
+ September
+ Su Mo Tu We Th Fr Sa
+ 244 245 246 247 248
+249 250 251 252 253 254 255
+256 257 258 259 260 261 262
+263 264 265 266 267 268 269
+270 271 272 273
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200908-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200908-md-nhl.out
new file mode 100644
index 0000000..339870e
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200908-md-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ July August September
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 1 1 2 3 4 5
+ 5 6 7 8 9 10 11 2 3 4 5 6 7 8 6 7 8 9 10 11 12
+12 13 14 15 16 17 18 9 10 11 12 13 14 15 13 14 15 16 17 18 19
+19 20 21 22 23 24 25 16 17 18 19 20 21 22 20 21 22 23 24 25 26
+26 27 28 29 30 31 23 24 25 26 27 28 29 27 28 29 30
+ 30 31
diff --git a/usr.bin/ncal/tests/regress.b-3m200909-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200909-jd-nhl.out
new file mode 100644
index 0000000..befa00d
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200909-jd-nhl.out
@@ -0,0 +1,17 @@
+ August 2009 September 2009
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 213 244 245 246 247 248
+214 215 216 217 218 219 220 249 250 251 252 253 254 255
+221 222 223 224 225 226 227 256 257 258 259 260 261 262
+228 229 230 231 232 233 234 263 264 265 266 267 268 269
+235 236 237 238 239 240 241 270 271 272 273
+242 243
+
+ October 2009
+ Su Mo Tu We Th Fr Sa
+ 274 275 276
+277 278 279 280 281 282 283
+284 285 286 287 288 289 290
+291 292 293 294 295 296 297
+298 299 300 301 302 303 304
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200909-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200909-md-nhl.out
new file mode 100644
index 0000000..4fb2714
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200909-md-nhl.out
@@ -0,0 +1,8 @@
+ August 2009 September 2009 October 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 1 2 3 4 5 1 2 3
+ 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10
+ 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17
+16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24
+23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31
+30 31
diff --git a/usr.bin/ncal/tests/regress.b-3m200910-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200910-jd-nhl.out
new file mode 100644
index 0000000..0a29593
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200910-jd-nhl.out
@@ -0,0 +1,18 @@
+ 2009
+ September October
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 244 245 246 247 248 274 275 276
+249 250 251 252 253 254 255 277 278 279 280 281 282 283
+256 257 258 259 260 261 262 284 285 286 287 288 289 290
+263 264 265 266 267 268 269 291 292 293 294 295 296 297
+270 271 272 273 298 299 300 301 302 303 304
+
+
+ November
+ Su Mo Tu We Th Fr Sa
+305 306 307 308 309 310 311
+312 313 314 315 316 317 318
+319 320 321 322 323 324 325
+326 327 328 329 330 331 332
+333 334
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200910-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200910-md-nhl.out
new file mode 100644
index 0000000..29cd67e
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200910-md-nhl.out
@@ -0,0 +1,8 @@
+ September 2009 October 2009 November 2009
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7
+ 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14
+13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21
+20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28
+27 28 29 30 25 26 27 28 29 30 31 29 30
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200911-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200911-jd-nhl.out
new file mode 100644
index 0000000..4969cbc
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200911-jd-nhl.out
@@ -0,0 +1,17 @@
+ October 2009 November 2009
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 274 275 276 305 306 307 308 309 310 311
+277 278 279 280 281 282 283 312 313 314 315 316 317 318
+284 285 286 287 288 289 290 319 320 321 322 323 324 325
+291 292 293 294 295 296 297 326 327 328 329 330 331 332
+298 299 300 301 302 303 304 333 334
+
+
+ December 2009
+ Su Mo Tu We Th Fr Sa
+ 335 336 337 338 339
+340 341 342 343 344 345 346
+347 348 349 350 351 352 353
+354 355 356 357 358 359 360
+361 362 363 364 365
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200911-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200911-md-nhl.out
new file mode 100644
index 0000000..b1f57ff
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200911-md-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ October November December
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5
+ 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12
+11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19
+18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26
+25 26 27 28 29 30 31 29 30 27 28 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.b-3m200912-jd-nhl.out b/usr.bin/ncal/tests/regress.b-3m200912-jd-nhl.out
new file mode 100644
index 0000000..61480a5
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200912-jd-nhl.out
@@ -0,0 +1,19 @@
+ 2009
+ November December
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+305 306 307 308 309 310 311 335 336 337 338 339
+312 313 314 315 316 317 318 340 341 342 343 344 345 346
+319 320 321 322 323 324 325 347 348 349 350 351 352 353
+326 327 328 329 330 331 332 354 355 356 357 358 359 360
+333 334 361 362 363 364 365
+
+
+ 2010
+ January
+ Su Mo Tu We Th Fr Sa
+ 1 2
+ 3 4 5 6 7 8 9
+ 10 11 12 13 14 15 16
+ 17 18 19 20 21 22 23
+ 24 25 26 27 28 29 30
+ 31
diff --git a/usr.bin/ncal/tests/regress.b-3m200912-md-nhl.out b/usr.bin/ncal/tests/regress.b-3m200912-md-nhl.out
new file mode 100644
index 0000000..fd4d220
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-3m200912-md-nhl.out
@@ -0,0 +1,8 @@
+ November 2009 December 2009 January 2010
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6 7 1 2 3 4 5 1 2
+ 8 9 10 11 12 13 14 6 7 8 9 10 11 12 3 4 5 6 7 8 9
+15 16 17 18 19 20 21 13 14 15 16 17 18 19 10 11 12 13 14 15 16
+22 23 24 25 26 27 28 20 21 22 23 24 25 26 17 18 19 20 21 22 23
+29 30 27 28 29 30 31 24 25 26 27 28 29 30
+ 31
diff --git a/usr.bin/ncal/tests/regress.b-y2008-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2008-jd-nhl.out
new file mode 100644
index 0000000..cd423db
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2008-jd-nhl.out
@@ -0,0 +1,54 @@
+ 2008
+ January February
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 32 33
+ 6 7 8 9 10 11 12 34 35 36 37 38 39 40
+ 13 14 15 16 17 18 19 41 42 43 44 45 46 47
+ 20 21 22 23 24 25 26 48 49 50 51 52 53 54
+ 27 28 29 30 31 55 56 57 58 59 60
+
+
+ March April
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 61 92 93 94 95 96
+ 62 63 64 65 66 67 68 97 98 99 100 101 102 103
+ 69 70 71 72 73 74 75 104 105 106 107 108 109 110
+ 76 77 78 79 80 81 82 111 112 113 114 115 116 117
+ 83 84 85 86 87 88 89 118 119 120 121
+ 90 91
+
+ May June
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 122 123 124 153 154 155 156 157 158 159
+125 126 127 128 129 130 131 160 161 162 163 164 165 166
+132 133 134 135 136 137 138 167 168 169 170 171 172 173
+139 140 141 142 143 144 145 174 175 176 177 178 179 180
+146 147 148 149 150 151 152 181 182
+
+
+ July August
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 183 184 185 186 187 214 215
+188 189 190 191 192 193 194 216 217 218 219 220 221 222
+195 196 197 198 199 200 201 223 224 225 226 227 228 229
+202 203 204 205 206 207 208 230 231 232 233 234 235 236
+209 210 211 212 213 237 238 239 240 241 242 243
+ 244
+
+ September October
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 245 246 247 248 249 250 275 276 277 278
+251 252 253 254 255 256 257 279 280 281 282 283 284 285
+258 259 260 261 262 263 264 286 287 288 289 290 291 292
+265 266 267 268 269 270 271 293 294 295 296 297 298 299
+272 273 274 300 301 302 303 304 305
+
+
+ November December
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 306 336 337 338 339 340 341
+307 308 309 310 311 312 313 342 343 344 345 346 347 348
+314 315 316 317 318 319 320 349 350 351 352 353 354 355
+321 322 323 324 325 326 327 356 357 358 359 360 361 362
+328 329 330 331 332 333 334 363 364 365 366
+335
diff --git a/usr.bin/ncal/tests/regress.b-y2008-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2008-md-nhl.out
new file mode 100644
index 0000000..dcd96fc
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2008-md-nhl.out
@@ -0,0 +1,36 @@
+ 2008
+ January February March
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 1 2 1
+ 6 7 8 9 10 11 12 3 4 5 6 7 8 9 2 3 4 5 6 7 8
+13 14 15 16 17 18 19 10 11 12 13 14 15 16 9 10 11 12 13 14 15
+20 21 22 23 24 25 26 17 18 19 20 21 22 23 16 17 18 19 20 21 22
+27 28 29 30 31 24 25 26 27 28 29 23 24 25 26 27 28 29
+ 30 31
+
+ April May June
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7
+ 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14
+13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21
+20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28
+27 28 29 30 25 26 27 28 29 30 31 29 30
+
+
+ July August September
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 1 2 1 2 3 4 5 6
+ 6 7 8 9 10 11 12 3 4 5 6 7 8 9 7 8 9 10 11 12 13
+13 14 15 16 17 18 19 10 11 12 13 14 15 16 14 15 16 17 18 19 20
+20 21 22 23 24 25 26 17 18 19 20 21 22 23 21 22 23 24 25 26 27
+27 28 29 30 31 24 25 26 27 28 29 30 28 29 30
+ 31
+
+ October November December
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 1 1 2 3 4 5 6
+ 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13
+12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20
+19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27
+26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31
+ 30
diff --git a/usr.bin/ncal/tests/regress.b-y2009-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2009-jd-nhl.out
new file mode 100644
index 0000000..db22d05
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2009-jd-nhl.out
@@ -0,0 +1,54 @@
+ 2009
+ January February
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 32 33 34 35 36 37 38
+ 4 5 6 7 8 9 10 39 40 41 42 43 44 45
+ 11 12 13 14 15 16 17 46 47 48 49 50 51 52
+ 18 19 20 21 22 23 24 53 54 55 56 57 58 59
+ 25 26 27 28 29 30 31
+
+
+ March April
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 60 61 62 63 64 65 66 91 92 93 94
+ 67 68 69 70 71 72 73 95 96 97 98 99 100 101
+ 74 75 76 77 78 79 80 102 103 104 105 106 107 108
+ 81 82 83 84 85 86 87 109 110 111 112 113 114 115
+ 88 89 90 116 117 118 119 120
+
+
+ May June
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 121 122 152 153 154 155 156 157
+123 124 125 126 127 128 129 158 159 160 161 162 163 164
+130 131 132 133 134 135 136 165 166 167 168 169 170 171
+137 138 139 140 141 142 143 172 173 174 175 176 177 178
+144 145 146 147 148 149 150 179 180 181
+151
+
+ July August
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 182 183 184 185 213
+186 187 188 189 190 191 192 214 215 216 217 218 219 220
+193 194 195 196 197 198 199 221 222 223 224 225 226 227
+200 201 202 203 204 205 206 228 229 230 231 232 233 234
+207 208 209 210 211 212 235 236 237 238 239 240 241
+ 242 243
+
+ September October
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 244 245 246 247 248 274 275 276
+249 250 251 252 253 254 255 277 278 279 280 281 282 283
+256 257 258 259 260 261 262 284 285 286 287 288 289 290
+263 264 265 266 267 268 269 291 292 293 294 295 296 297
+270 271 272 273 298 299 300 301 302 303 304
+
+
+ November December
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+305 306 307 308 309 310 311 335 336 337 338 339
+312 313 314 315 316 317 318 340 341 342 343 344 345 346
+319 320 321 322 323 324 325 347 348 349 350 351 352 353
+326 327 328 329 330 331 332 354 355 356 357 358 359 360
+333 334 361 362 363 364 365
+
diff --git a/usr.bin/ncal/tests/regress.b-y2009-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2009-md-nhl.out
new file mode 100644
index 0000000..c9f084e
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2009-md-nhl.out
@@ -0,0 +1,36 @@
+ 2009
+ January February March
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 6 7
+ 4 5 6 7 8 9 10 8 9 10 11 12 13 14 8 9 10 11 12 13 14
+11 12 13 14 15 16 17 15 16 17 18 19 20 21 15 16 17 18 19 20 21
+18 19 20 21 22 23 24 22 23 24 25 26 27 28 22 23 24 25 26 27 28
+25 26 27 28 29 30 31 29 30 31
+
+
+ April May June
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 1 2 1 2 3 4 5 6
+ 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13
+12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20
+19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27
+26 27 28 29 30 24 25 26 27 28 29 30 28 29 30
+ 31
+
+ July August September
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 4 1 1 2 3 4 5
+ 5 6 7 8 9 10 11 2 3 4 5 6 7 8 6 7 8 9 10 11 12
+12 13 14 15 16 17 18 9 10 11 12 13 14 15 13 14 15 16 17 18 19
+19 20 21 22 23 24 25 16 17 18 19 20 21 22 20 21 22 23 24 25 26
+26 27 28 29 30 31 23 24 25 26 27 28 29 27 28 29 30
+ 30 31
+
+ October November December
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5
+ 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12
+11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19
+18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26
+25 26 27 28 29 30 31 29 30 27 28 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.b-y2010-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2010-jd-nhl.out
new file mode 100644
index 0000000..d7ad9fc
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2010-jd-nhl.out
@@ -0,0 +1,54 @@
+ 2010
+ January February
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 32 33 34 35 36 37
+ 3 4 5 6 7 8 9 38 39 40 41 42 43 44
+ 10 11 12 13 14 15 16 45 46 47 48 49 50 51
+ 17 18 19 20 21 22 23 52 53 54 55 56 57 58
+ 24 25 26 27 28 29 30 59
+ 31
+
+ March April
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 60 61 62 63 64 65 91 92 93
+ 66 67 68 69 70 71 72 94 95 96 97 98 99 100
+ 73 74 75 76 77 78 79 101 102 103 104 105 106 107
+ 80 81 82 83 84 85 86 108 109 110 111 112 113 114
+ 87 88 89 90 115 116 117 118 119 120
+
+
+ May June
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 121 152 153 154 155 156
+122 123 124 125 126 127 128 157 158 159 160 161 162 163
+129 130 131 132 133 134 135 164 165 166 167 168 169 170
+136 137 138 139 140 141 142 171 172 173 174 175 176 177
+143 144 145 146 147 148 149 178 179 180 181
+150 151
+
+ July August
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 182 183 184 213 214 215 216 217 218 219
+185 186 187 188 189 190 191 220 221 222 223 224 225 226
+192 193 194 195 196 197 198 227 228 229 230 231 232 233
+199 200 201 202 203 204 205 234 235 236 237 238 239 240
+206 207 208 209 210 211 212 241 242 243
+
+
+ September October
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 244 245 246 247 274 275
+248 249 250 251 252 253 254 276 277 278 279 280 281 282
+255 256 257 258 259 260 261 283 284 285 286 287 288 289
+262 263 264 265 266 267 268 290 291 292 293 294 295 296
+269 270 271 272 273 297 298 299 300 301 302 303
+ 304
+
+ November December
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 305 306 307 308 309 310 335 336 337 338
+311 312 313 314 315 316 317 339 340 341 342 343 344 345
+318 319 320 321 322 323 324 346 347 348 349 350 351 352
+325 326 327 328 329 330 331 353 354 355 356 357 358 359
+332 333 334 360 361 362 363 364 365
+
diff --git a/usr.bin/ncal/tests/regress.b-y2010-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2010-md-nhl.out
new file mode 100644
index 0000000..1d8a410
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2010-md-nhl.out
@@ -0,0 +1,36 @@
+ 2010
+ January February March
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 2 3 4 5 6 1 2 3 4 5 6
+ 3 4 5 6 7 8 9 7 8 9 10 11 12 13 7 8 9 10 11 12 13
+10 11 12 13 14 15 16 14 15 16 17 18 19 20 14 15 16 17 18 19 20
+17 18 19 20 21 22 23 21 22 23 24 25 26 27 21 22 23 24 25 26 27
+24 25 26 27 28 29 30 28 28 29 30 31
+31
+
+ April May June
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 1 1 2 3 4 5
+ 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12
+11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19
+18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26
+25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30
+ 30 31
+
+ July August September
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 3 1 2 3 4 5 6 7 1 2 3 4
+ 4 5 6 7 8 9 10 8 9 10 11 12 13 14 5 6 7 8 9 10 11
+11 12 13 14 15 16 17 15 16 17 18 19 20 21 12 13 14 15 16 17 18
+18 19 20 21 22 23 24 22 23 24 25 26 27 28 19 20 21 22 23 24 25
+25 26 27 28 29 30 31 29 30 31 26 27 28 29 30
+
+
+ October November December
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 2 3 4 5 6 1 2 3 4
+ 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11
+10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18
+17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25
+24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31
+31
diff --git a/usr.bin/ncal/tests/regress.b-y2011-jd-nhl.out b/usr.bin/ncal/tests/regress.b-y2011-jd-nhl.out
new file mode 100644
index 0000000..31abb4e
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2011-jd-nhl.out
@@ -0,0 +1,54 @@
+ 2011
+ January February
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 32 33 34 35 36
+ 2 3 4 5 6 7 8 37 38 39 40 41 42 43
+ 9 10 11 12 13 14 15 44 45 46 47 48 49 50
+ 16 17 18 19 20 21 22 51 52 53 54 55 56 57
+ 23 24 25 26 27 28 29 58 59
+ 30 31
+
+ March April
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 60 61 62 63 64 91 92
+ 65 66 67 68 69 70 71 93 94 95 96 97 98 99
+ 72 73 74 75 76 77 78 100 101 102 103 104 105 106
+ 79 80 81 82 83 84 85 107 108 109 110 111 112 113
+ 86 87 88 89 90 114 115 116 117 118 119 120
+
+
+ May June
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+121 122 123 124 125 126 127 152 153 154 155
+128 129 130 131 132 133 134 156 157 158 159 160 161 162
+135 136 137 138 139 140 141 163 164 165 166 167 168 169
+142 143 144 145 146 147 148 170 171 172 173 174 175 176
+149 150 151 177 178 179 180 181
+
+
+ July August
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 182 183 213 214 215 216 217 218
+184 185 186 187 188 189 190 219 220 221 222 223 224 225
+191 192 193 194 195 196 197 226 227 228 229 230 231 232
+198 199 200 201 202 203 204 233 234 235 236 237 238 239
+205 206 207 208 209 210 211 240 241 242 243
+212
+
+ September October
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 244 245 246 274
+247 248 249 250 251 252 253 275 276 277 278 279 280 281
+254 255 256 257 258 259 260 282 283 284 285 286 287 288
+261 262 263 264 265 266 267 289 290 291 292 293 294 295
+268 269 270 271 272 273 296 297 298 299 300 301 302
+ 303 304
+
+ November December
+ Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 305 306 307 308 309 335 336 337
+310 311 312 313 314 315 316 338 339 340 341 342 343 344
+317 318 319 320 321 322 323 345 346 347 348 349 350 351
+324 325 326 327 328 329 330 352 353 354 355 356 357 358
+331 332 333 334 359 360 361 362 363 364 365
+
diff --git a/usr.bin/ncal/tests/regress.b-y2011-md-nhl.out b/usr.bin/ncal/tests/regress.b-y2011-md-nhl.out
new file mode 100644
index 0000000..d76a44f
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.b-y2011-md-nhl.out
@@ -0,0 +1,36 @@
+ 2011
+ January February March
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 1 2 3 4 5 1 2 3 4 5
+ 2 3 4 5 6 7 8 6 7 8 9 10 11 12 6 7 8 9 10 11 12
+ 9 10 11 12 13 14 15 13 14 15 16 17 18 19 13 14 15 16 17 18 19
+16 17 18 19 20 21 22 20 21 22 23 24 25 26 20 21 22 23 24 25 26
+23 24 25 26 27 28 29 27 28 27 28 29 30 31
+30 31
+
+ April May June
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 2 3 4 5 6 7 1 2 3 4
+ 3 4 5 6 7 8 9 8 9 10 11 12 13 14 5 6 7 8 9 10 11
+10 11 12 13 14 15 16 15 16 17 18 19 20 21 12 13 14 15 16 17 18
+17 18 19 20 21 22 23 22 23 24 25 26 27 28 19 20 21 22 23 24 25
+24 25 26 27 28 29 30 29 30 31 26 27 28 29 30
+
+
+ July August September
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 2 3 4 5 6 1 2 3
+ 3 4 5 6 7 8 9 7 8 9 10 11 12 13 4 5 6 7 8 9 10
+10 11 12 13 14 15 16 14 15 16 17 18 19 20 11 12 13 14 15 16 17
+17 18 19 20 21 22 23 21 22 23 24 25 26 27 18 19 20 21 22 23 24
+24 25 26 27 28 29 30 28 29 30 31 25 26 27 28 29 30
+31
+
+ October November December
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 1 2 3 4 5 1 2 3
+ 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10
+ 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17
+16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24
+23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31
+30 31
diff --git a/usr.bin/ncal/tests/regress.f-3A-nhl.out b/usr.bin/ncal/tests/regress.f-3A-nhl.out
new file mode 100644
index 0000000..e7f5e91
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-3A-nhl.out
@@ -0,0 +1 @@
+ncal: -3 together with -A and -B is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-3AB-nhl.out b/usr.bin/ncal/tests/regress.f-3AB-nhl.out
new file mode 100644
index 0000000..e7f5e91
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-3AB-nhl.out
@@ -0,0 +1 @@
+ncal: -3 together with -A and -B is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-3B-nhl.out b/usr.bin/ncal/tests/regress.f-3B-nhl.out
new file mode 100644
index 0000000..e7f5e91
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-3B-nhl.out
@@ -0,0 +1 @@
+ncal: -3 together with -A and -B is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-3gy-nhl.out b/usr.bin/ncal/tests/regress.f-3gy-nhl.out
new file mode 100644
index 0000000..018646f
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-3gy-nhl.out
@@ -0,0 +1 @@
+ncal: -3 together with a given year but no given month is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-3y-nhl.out b/usr.bin/ncal/tests/regress.f-3y-nhl.out
new file mode 100644
index 0000000..5b2e000
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-3y-nhl.out
@@ -0,0 +1 @@
+ncal: -3 together with -y is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-mgm-nhl.out b/usr.bin/ncal/tests/regress.f-mgm-nhl.out
new file mode 100644
index 0000000..5f6c2eb
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-mgm-nhl.out
@@ -0,0 +1 @@
+ncal: -m together with a given month is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-yA-nhl.out b/usr.bin/ncal/tests/regress.f-yA-nhl.out
new file mode 100644
index 0000000..ce39ae7
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-yA-nhl.out
@@ -0,0 +1 @@
+ncal: -y together a -A or -B is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-yAB-nhl.out b/usr.bin/ncal/tests/regress.f-yAB-nhl.out
new file mode 100644
index 0000000..ce39ae7
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-yAB-nhl.out
@@ -0,0 +1 @@
+ncal: -y together a -A or -B is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-yB-nhl.out b/usr.bin/ncal/tests/regress.f-yB-nhl.out
new file mode 100644
index 0000000..ce39ae7
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-yB-nhl.out
@@ -0,0 +1 @@
+ncal: -y together a -A or -B is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-ygm-nhl.out b/usr.bin/ncal/tests/regress.f-ygm-nhl.out
new file mode 100644
index 0000000..6f898eb
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-ygm-nhl.out
@@ -0,0 +1 @@
+ncal: -y together a given month is not supported.
diff --git a/usr.bin/ncal/tests/regress.f-ym-nhl.out b/usr.bin/ncal/tests/regress.f-ym-nhl.out
new file mode 100644
index 0000000..1921d92
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.f-ym-nhl.out
@@ -0,0 +1 @@
+ncal: -y together with -m is not supported.
diff --git a/usr.bin/ncal/tests/regress.r-3m200901-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200901-jd-nhl.out
new file mode 100644
index 0000000..26ef49b
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200901-jd-nhl.out
@@ -0,0 +1,8 @@
+ December 2008 January 2009 February 2009
+Mo 336 343 350 357 364 5 12 19 26 33 40 47 54
+Tu 337 344 351 358 365 6 13 20 27 34 41 48 55
+We 338 345 352 359 366 7 14 21 28 35 42 49 56
+Th 339 346 353 360 1 8 15 22 29 36 43 50 57
+Fr 340 347 354 361 2 9 16 23 30 37 44 51 58
+Sa 341 348 355 362 3 10 17 24 31 38 45 52 59
+Su 342 349 356 363 4 11 18 25 32 39 46 53
diff --git a/usr.bin/ncal/tests/regress.r-3m200901-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200901-md-nhl.out
new file mode 100644
index 0000000..d197fd3
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200901-md-nhl.out
@@ -0,0 +1,8 @@
+ December 2008 January 2009 February 2009
+Mo 1 8 15 22 29 5 12 19 26 2 9 16 23
+Tu 2 9 16 23 30 6 13 20 27 3 10 17 24
+We 3 10 17 24 31 7 14 21 28 4 11 18 25
+Th 4 11 18 25 1 8 15 22 29 5 12 19 26
+Fr 5 12 19 26 2 9 16 23 30 6 13 20 27
+Sa 6 13 20 27 3 10 17 24 31 7 14 21 28
+Su 7 14 21 28 4 11 18 25 1 8 15 22
diff --git a/usr.bin/ncal/tests/regress.r-3m200902-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200902-jd-nhl.out
new file mode 100644
index 0000000..cd84869
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200902-jd-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ January February March
+Mo 5 12 19 26 33 40 47 54 61 68 75 82 89
+Tu 6 13 20 27 34 41 48 55 62 69 76 83 90
+We 7 14 21 28 35 42 49 56 63 70 77 84
+Th 1 8 15 22 29 36 43 50 57 64 71 78 85
+Fr 2 9 16 23 30 37 44 51 58 65 72 79 86
+Sa 3 10 17 24 31 38 45 52 59 66 73 80 87
+Su 4 11 18 25 32 39 46 53 60 67 74 81 88
diff --git a/usr.bin/ncal/tests/regress.r-3m200902-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200902-md-nhl.out
new file mode 100644
index 0000000..20c35f1
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200902-md-nhl.out
@@ -0,0 +1,8 @@
+ January 2009 February 2009 March 2009
+Mo 5 12 19 26 2 9 16 23 2 9 16 23 30
+Tu 6 13 20 27 3 10 17 24 3 10 17 24 31
+We 7 14 21 28 4 11 18 25 4 11 18 25
+Th 1 8 15 22 29 5 12 19 26 5 12 19 26
+Fr 2 9 16 23 30 6 13 20 27 6 13 20 27
+Sa 3 10 17 24 31 7 14 21 28 7 14 21 28
+Su 4 11 18 25 1 8 15 22 1 8 15 22 29
diff --git a/usr.bin/ncal/tests/regress.r-3m200903-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200903-jd-nhl.out
new file mode 100644
index 0000000..1ca28e0
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200903-jd-nhl.out
@@ -0,0 +1,8 @@
+ February 2009 March 2009 April 2009
+Mo 33 40 47 54 61 68 75 82 89 96 103 110 117
+Tu 34 41 48 55 62 69 76 83 90 97 104 111 118
+We 35 42 49 56 63 70 77 84 91 98 105 112 119
+Th 36 43 50 57 64 71 78 85 92 99 106 113 120
+Fr 37 44 51 58 65 72 79 86 93 100 107 114
+Sa 38 45 52 59 66 73 80 87 94 101 108 115
+Su 32 39 46 53 60 67 74 81 88 95 102 109 116
diff --git a/usr.bin/ncal/tests/regress.r-3m200903-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200903-md-nhl.out
new file mode 100644
index 0000000..19fc969
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200903-md-nhl.out
@@ -0,0 +1,8 @@
+ February 2009 March 2009 April 2009
+Mo 2 9 16 23 2 9 16 23 30 6 13 20 27
+Tu 3 10 17 24 3 10 17 24 31 7 14 21 28
+We 4 11 18 25 4 11 18 25 1 8 15 22 29
+Th 5 12 19 26 5 12 19 26 2 9 16 23 30
+Fr 6 13 20 27 6 13 20 27 3 10 17 24
+Sa 7 14 21 28 7 14 21 28 4 11 18 25
+Su 1 8 15 22 1 8 15 22 29 5 12 19 26
diff --git a/usr.bin/ncal/tests/regress.r-3m200904-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200904-jd-nhl.out
new file mode 100644
index 0000000..8b8e77a
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200904-jd-nhl.out
@@ -0,0 +1,8 @@
+ March 2009 April 2009 May 2009
+Mo 61 68 75 82 89 96 103 110 117 124 131 138 145
+Tu 62 69 76 83 90 97 104 111 118 125 132 139 146
+We 63 70 77 84 91 98 105 112 119 126 133 140 147
+Th 64 71 78 85 92 99 106 113 120 127 134 141 148
+Fr 65 72 79 86 93 100 107 114 121 128 135 142 149
+Sa 66 73 80 87 94 101 108 115 122 129 136 143 150
+Su 60 67 74 81 88 95 102 109 116 123 130 137 144 151
diff --git a/usr.bin/ncal/tests/regress.r-3m200904-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200904-md-nhl.out
new file mode 100644
index 0000000..449127c
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200904-md-nhl.out
@@ -0,0 +1,8 @@
+ March 2009 April 2009 May 2009
+Mo 2 9 16 23 30 6 13 20 27 4 11 18 25
+Tu 3 10 17 24 31 7 14 21 28 5 12 19 26
+We 4 11 18 25 1 8 15 22 29 6 13 20 27
+Th 5 12 19 26 2 9 16 23 30 7 14 21 28
+Fr 6 13 20 27 3 10 17 24 1 8 15 22 29
+Sa 7 14 21 28 4 11 18 25 2 9 16 23 30
+Su 1 8 15 22 29 5 12 19 26 3 10 17 24 31
diff --git a/usr.bin/ncal/tests/regress.r-3m200905-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200905-jd-nhl.out
new file mode 100644
index 0000000..9054a1f
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200905-jd-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ April May June
+Mo 96 103 110 117 124 131 138 145 152 159 166 173 180
+Tu 97 104 111 118 125 132 139 146 153 160 167 174 181
+We 91 98 105 112 119 126 133 140 147 154 161 168 175
+Th 92 99 106 113 120 127 134 141 148 155 162 169 176
+Fr 93 100 107 114 121 128 135 142 149 156 163 170 177
+Sa 94 101 108 115 122 129 136 143 150 157 164 171 178
+Su 95 102 109 116 123 130 137 144 151 158 165 172 179
diff --git a/usr.bin/ncal/tests/regress.r-3m200905-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200905-md-nhl.out
new file mode 100644
index 0000000..4a6a635
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200905-md-nhl.out
@@ -0,0 +1,8 @@
+ April 2009 May 2009 June 2009
+Mo 6 13 20 27 4 11 18 25 1 8 15 22 29
+Tu 7 14 21 28 5 12 19 26 2 9 16 23 30
+We 1 8 15 22 29 6 13 20 27 3 10 17 24
+Th 2 9 16 23 30 7 14 21 28 4 11 18 25
+Fr 3 10 17 24 1 8 15 22 29 5 12 19 26
+Sa 4 11 18 25 2 9 16 23 30 6 13 20 27
+Su 5 12 19 26 3 10 17 24 31 7 14 21 28
diff --git a/usr.bin/ncal/tests/regress.r-3m200906-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200906-jd-nhl.out
new file mode 100644
index 0000000..6eb35eb
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200906-jd-nhl.out
@@ -0,0 +1,8 @@
+ May 2009 June 2009 July 2009
+Mo 124 131 138 145 152 159 166 173 180 187 194 201 208
+Tu 125 132 139 146 153 160 167 174 181 188 195 202 209
+We 126 133 140 147 154 161 168 175 182 189 196 203 210
+Th 127 134 141 148 155 162 169 176 183 190 197 204 211
+Fr 121 128 135 142 149 156 163 170 177 184 191 198 205 212
+Sa 122 129 136 143 150 157 164 171 178 185 192 199 206
+Su 123 130 137 144 151 158 165 172 179 186 193 200 207
diff --git a/usr.bin/ncal/tests/regress.r-3m200906-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200906-md-nhl.out
new file mode 100644
index 0000000..53f1274
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200906-md-nhl.out
@@ -0,0 +1,8 @@
+ May 2009 June 2009 July 2009
+Mo 4 11 18 25 1 8 15 22 29 6 13 20 27
+Tu 5 12 19 26 2 9 16 23 30 7 14 21 28
+We 6 13 20 27 3 10 17 24 1 8 15 22 29
+Th 7 14 21 28 4 11 18 25 2 9 16 23 30
+Fr 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Sa 2 9 16 23 30 6 13 20 27 4 11 18 25
+Su 3 10 17 24 31 7 14 21 28 5 12 19 26
diff --git a/usr.bin/ncal/tests/regress.r-3m200907-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200907-jd-nhl.out
new file mode 100644
index 0000000..8c5701a
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200907-jd-nhl.out
@@ -0,0 +1,8 @@
+ June 2009 July 2009 August 2009
+Mo 152 159 166 173 180 187 194 201 208 215 222 229 236 243
+Tu 153 160 167 174 181 188 195 202 209 216 223 230 237
+We 154 161 168 175 182 189 196 203 210 217 224 231 238
+Th 155 162 169 176 183 190 197 204 211 218 225 232 239
+Fr 156 163 170 177 184 191 198 205 212 219 226 233 240
+Sa 157 164 171 178 185 192 199 206 213 220 227 234 241
+Su 158 165 172 179 186 193 200 207 214 221 228 235 242
diff --git a/usr.bin/ncal/tests/regress.r-3m200907-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200907-md-nhl.out
new file mode 100644
index 0000000..f07ea0a
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200907-md-nhl.out
@@ -0,0 +1,8 @@
+ June 2009 July 2009 August 2009
+Mo 1 8 15 22 29 6 13 20 27 3 10 17 24 31
+Tu 2 9 16 23 30 7 14 21 28 4 11 18 25
+We 3 10 17 24 1 8 15 22 29 5 12 19 26
+Th 4 11 18 25 2 9 16 23 30 6 13 20 27
+Fr 5 12 19 26 3 10 17 24 31 7 14 21 28
+Sa 6 13 20 27 4 11 18 25 1 8 15 22 29
+Su 7 14 21 28 5 12 19 26 2 9 16 23 30
diff --git a/usr.bin/ncal/tests/regress.r-3m200908-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200908-jd-nhl.out
new file mode 100644
index 0000000..9d50894
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200908-jd-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ July August September
+Mo 187 194 201 208 215 222 229 236 243 250 257 264 271
+Tu 188 195 202 209 216 223 230 237 244 251 258 265 272
+We 182 189 196 203 210 217 224 231 238 245 252 259 266 273
+Th 183 190 197 204 211 218 225 232 239 246 253 260 267
+Fr 184 191 198 205 212 219 226 233 240 247 254 261 268
+Sa 185 192 199 206 213 220 227 234 241 248 255 262 269
+Su 186 193 200 207 214 221 228 235 242 249 256 263 270
diff --git a/usr.bin/ncal/tests/regress.r-3m200908-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200908-md-nhl.out
new file mode 100644
index 0000000..e4822eb
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200908-md-nhl.out
@@ -0,0 +1,8 @@
+ July 2009 August 2009 September 2009
+Mo 6 13 20 27 3 10 17 24 31 7 14 21 28
+Tu 7 14 21 28 4 11 18 25 1 8 15 22 29
+We 1 8 15 22 29 5 12 19 26 2 9 16 23 30
+Th 2 9 16 23 30 6 13 20 27 3 10 17 24
+Fr 3 10 17 24 31 7 14 21 28 4 11 18 25
+Sa 4 11 18 25 1 8 15 22 29 5 12 19 26
+Su 5 12 19 26 2 9 16 23 30 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.r-3m200909-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200909-jd-nhl.out
new file mode 100644
index 0000000..3bccbf5
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200909-jd-nhl.out
@@ -0,0 +1,8 @@
+ August 2009 September 2009 October 2009
+Mo 215 222 229 236 243 250 257 264 271 278 285 292 299
+Tu 216 223 230 237 244 251 258 265 272 279 286 293 300
+We 217 224 231 238 245 252 259 266 273 280 287 294 301
+Th 218 225 232 239 246 253 260 267 274 281 288 295 302
+Fr 219 226 233 240 247 254 261 268 275 282 289 296 303
+Sa 213 220 227 234 241 248 255 262 269 276 283 290 297 304
+Su 214 221 228 235 242 249 256 263 270 277 284 291 298
diff --git a/usr.bin/ncal/tests/regress.r-3m200909-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200909-md-nhl.out
new file mode 100644
index 0000000..0c77c2d
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200909-md-nhl.out
@@ -0,0 +1,8 @@
+ August 2009 September 2009 October 2009
+Mo 3 10 17 24 31 7 14 21 28 5 12 19 26
+Tu 4 11 18 25 1 8 15 22 29 6 13 20 27
+We 5 12 19 26 2 9 16 23 30 7 14 21 28
+Th 6 13 20 27 3 10 17 24 1 8 15 22 29
+Fr 7 14 21 28 4 11 18 25 2 9 16 23 30
+Sa 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Su 2 9 16 23 30 6 13 20 27 4 11 18 25
diff --git a/usr.bin/ncal/tests/regress.r-3m200910-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200910-jd-nhl.out
new file mode 100644
index 0000000..f5598e1
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200910-jd-nhl.out
@@ -0,0 +1,8 @@
+ September 2009 October 2009 November 2009
+Mo 250 257 264 271 278 285 292 299 306 313 320 327 334
+Tu 244 251 258 265 272 279 286 293 300 307 314 321 328
+We 245 252 259 266 273 280 287 294 301 308 315 322 329
+Th 246 253 260 267 274 281 288 295 302 309 316 323 330
+Fr 247 254 261 268 275 282 289 296 303 310 317 324 331
+Sa 248 255 262 269 276 283 290 297 304 311 318 325 332
+Su 249 256 263 270 277 284 291 298 305 312 319 326 333
diff --git a/usr.bin/ncal/tests/regress.r-3m200910-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200910-md-nhl.out
new file mode 100644
index 0000000..18561d2
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200910-md-nhl.out
@@ -0,0 +1,8 @@
+ September 2009 October 2009 November 2009
+Mo 7 14 21 28 5 12 19 26 2 9 16 23 30
+Tu 1 8 15 22 29 6 13 20 27 3 10 17 24
+We 2 9 16 23 30 7 14 21 28 4 11 18 25
+Th 3 10 17 24 1 8 15 22 29 5 12 19 26
+Fr 4 11 18 25 2 9 16 23 30 6 13 20 27
+Sa 5 12 19 26 3 10 17 24 31 7 14 21 28
+Su 6 13 20 27 4 11 18 25 1 8 15 22 29
diff --git a/usr.bin/ncal/tests/regress.r-3m200911-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200911-jd-nhl.out
new file mode 100644
index 0000000..4b8d1db
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200911-jd-nhl.out
@@ -0,0 +1,9 @@
+ 2009
+ October November December
+Mo 278 285 292 299 306 313 320 327 334 341 348 355 362
+Tu 279 286 293 300 307 314 321 328 335 342 349 356 363
+We 280 287 294 301 308 315 322 329 336 343 350 357 364
+Th 274 281 288 295 302 309 316 323 330 337 344 351 358 365
+Fr 275 282 289 296 303 310 317 324 331 338 345 352 359
+Sa 276 283 290 297 304 311 318 325 332 339 346 353 360
+Su 277 284 291 298 305 312 319 326 333 340 347 354 361
diff --git a/usr.bin/ncal/tests/regress.r-3m200911-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200911-md-nhl.out
new file mode 100644
index 0000000..35f1371
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200911-md-nhl.out
@@ -0,0 +1,8 @@
+ October 2009 November 2009 December 2009
+Mo 5 12 19 26 2 9 16 23 30 7 14 21 28
+Tu 6 13 20 27 3 10 17 24 1 8 15 22 29
+We 7 14 21 28 4 11 18 25 2 9 16 23 30
+Th 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Fr 2 9 16 23 30 6 13 20 27 4 11 18 25
+Sa 3 10 17 24 31 7 14 21 28 5 12 19 26
+Su 4 11 18 25 1 8 15 22 29 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.r-3m200912-jd-nhl.out b/usr.bin/ncal/tests/regress.r-3m200912-jd-nhl.out
new file mode 100644
index 0000000..66efa29
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200912-jd-nhl.out
@@ -0,0 +1,8 @@
+ November 2009 December 2009 January 2010
+Mo 306 313 320 327 334 341 348 355 362 4 11 18 25
+Tu 307 314 321 328 335 342 349 356 363 5 12 19 26
+We 308 315 322 329 336 343 350 357 364 6 13 20 27
+Th 309 316 323 330 337 344 351 358 365 7 14 21 28
+Fr 310 317 324 331 338 345 352 359 1 8 15 22 29
+Sa 311 318 325 332 339 346 353 360 2 9 16 23 30
+Su 305 312 319 326 333 340 347 354 361 3 10 17 24 31
diff --git a/usr.bin/ncal/tests/regress.r-3m200912-md-nhl.out b/usr.bin/ncal/tests/regress.r-3m200912-md-nhl.out
new file mode 100644
index 0000000..c62332a
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-3m200912-md-nhl.out
@@ -0,0 +1,8 @@
+ November 2009 December 2009 January 2010
+Mo 2 9 16 23 30 7 14 21 28 4 11 18 25
+Tu 3 10 17 24 1 8 15 22 29 5 12 19 26
+We 4 11 18 25 2 9 16 23 30 6 13 20 27
+Th 5 12 19 26 3 10 17 24 31 7 14 21 28
+Fr 6 13 20 27 4 11 18 25 1 8 15 22 29
+Sa 7 14 21 28 5 12 19 26 2 9 16 23 30
+Su 1 8 15 22 29 6 13 20 27 3 10 17 24 31
diff --git a/usr.bin/ncal/tests/regress.r-y2008-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2008-jd-nhl.out
new file mode 100644
index 0000000..0ea30ae
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2008-jd-nhl.out
@@ -0,0 +1,36 @@
+ 2008
+ January February March
+Mo 7 14 21 28 35 42 49 56 63 70 77 84 91
+Tu 1 8 15 22 29 36 43 50 57 64 71 78 85
+We 2 9 16 23 30 37 44 51 58 65 72 79 86
+Th 3 10 17 24 31 38 45 52 59 66 73 80 87
+Fr 4 11 18 25 32 39 46 53 60 67 74 81 88
+Sa 5 12 19 26 33 40 47 54 61 68 75 82 89
+Su 6 13 20 27 34 41 48 55 62 69 76 83 90
+
+ April May June
+Mo 98 105 112 119 126 133 140 147 154 161 168 175 182
+Tu 92 99 106 113 120 127 134 141 148 155 162 169 176
+We 93 100 107 114 121 128 135 142 149 156 163 170 177
+Th 94 101 108 115 122 129 136 143 150 157 164 171 178
+Fr 95 102 109 116 123 130 137 144 151 158 165 172 179
+Sa 96 103 110 117 124 131 138 145 152 159 166 173 180
+Su 97 104 111 118 125 132 139 146 153 160 167 174 181
+
+ July August September
+Mo 189 196 203 210 217 224 231 238 245 252 259 266 273
+Tu 183 190 197 204 211 218 225 232 239 246 253 260 267 274
+We 184 191 198 205 212 219 226 233 240 247 254 261 268
+Th 185 192 199 206 213 220 227 234 241 248 255 262 269
+Fr 186 193 200 207 214 221 228 235 242 249 256 263 270
+Sa 187 194 201 208 215 222 229 236 243 250 257 264 271
+Su 188 195 202 209 216 223 230 237 244 251 258 265 272
+
+ October November December
+Mo 280 287 294 301 308 315 322 329 336 343 350 357 364
+Tu 281 288 295 302 309 316 323 330 337 344 351 358 365
+We 275 282 289 296 303 310 317 324 331 338 345 352 359 366
+Th 276 283 290 297 304 311 318 325 332 339 346 353 360
+Fr 277 284 291 298 305 312 319 326 333 340 347 354 361
+Sa 278 285 292 299 306 313 320 327 334 341 348 355 362
+Su 279 286 293 300 307 314 321 328 335 342 349 356 363
diff --git a/usr.bin/ncal/tests/regress.r-y2008-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2008-md-nhl.out
new file mode 100644
index 0000000..18191f6
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2008-md-nhl.out
@@ -0,0 +1,27 @@
+ 2008
+ January February March April
+Mo 7 14 21 28 4 11 18 25 3 10 17 24 31 7 14 21 28
+Tu 1 8 15 22 29 5 12 19 26 4 11 18 25 1 8 15 22 29
+We 2 9 16 23 30 6 13 20 27 5 12 19 26 2 9 16 23 30
+Th 3 10 17 24 31 7 14 21 28 6 13 20 27 3 10 17 24
+Fr 4 11 18 25 1 8 15 22 29 7 14 21 28 4 11 18 25
+Sa 5 12 19 26 2 9 16 23 1 8 15 22 29 5 12 19 26
+Su 6 13 20 27 3 10 17 24 2 9 16 23 30 6 13 20 27
+
+ May June July August
+Mo 5 12 19 26 2 9 16 23 30 7 14 21 28 4 11 18 25
+Tu 6 13 20 27 3 10 17 24 1 8 15 22 29 5 12 19 26
+We 7 14 21 28 4 11 18 25 2 9 16 23 30 6 13 20 27
+Th 1 8 15 22 29 5 12 19 26 3 10 17 24 31 7 14 21 28
+Fr 2 9 16 23 30 6 13 20 27 4 11 18 25 1 8 15 22 29
+Sa 3 10 17 24 31 7 14 21 28 5 12 19 26 2 9 16 23 30
+Su 4 11 18 25 1 8 15 22 29 6 13 20 27 3 10 17 24 31
+
+ September October November December
+Mo 1 8 15 22 29 6 13 20 27 3 10 17 24 1 8 15 22 29
+Tu 2 9 16 23 30 7 14 21 28 4 11 18 25 2 9 16 23 30
+We 3 10 17 24 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Th 4 11 18 25 2 9 16 23 30 6 13 20 27 4 11 18 25
+Fr 5 12 19 26 3 10 17 24 31 7 14 21 28 5 12 19 26
+Sa 6 13 20 27 4 11 18 25 1 8 15 22 29 6 13 20 27
+Su 7 14 21 28 5 12 19 26 2 9 16 23 30 7 14 21 28
diff --git a/usr.bin/ncal/tests/regress.r-y2009-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2009-jd-nhl.out
new file mode 100644
index 0000000..3869ace
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2009-jd-nhl.out
@@ -0,0 +1,36 @@
+ 2009
+ January February March
+Mo 5 12 19 26 33 40 47 54 61 68 75 82 89
+Tu 6 13 20 27 34 41 48 55 62 69 76 83 90
+We 7 14 21 28 35 42 49 56 63 70 77 84
+Th 1 8 15 22 29 36 43 50 57 64 71 78 85
+Fr 2 9 16 23 30 37 44 51 58 65 72 79 86
+Sa 3 10 17 24 31 38 45 52 59 66 73 80 87
+Su 4 11 18 25 32 39 46 53 60 67 74 81 88
+
+ April May June
+Mo 96 103 110 117 124 131 138 145 152 159 166 173 180
+Tu 97 104 111 118 125 132 139 146 153 160 167 174 181
+We 91 98 105 112 119 126 133 140 147 154 161 168 175
+Th 92 99 106 113 120 127 134 141 148 155 162 169 176
+Fr 93 100 107 114 121 128 135 142 149 156 163 170 177
+Sa 94 101 108 115 122 129 136 143 150 157 164 171 178
+Su 95 102 109 116 123 130 137 144 151 158 165 172 179
+
+ July August September
+Mo 187 194 201 208 215 222 229 236 243 250 257 264 271
+Tu 188 195 202 209 216 223 230 237 244 251 258 265 272
+We 182 189 196 203 210 217 224 231 238 245 252 259 266 273
+Th 183 190 197 204 211 218 225 232 239 246 253 260 267
+Fr 184 191 198 205 212 219 226 233 240 247 254 261 268
+Sa 185 192 199 206 213 220 227 234 241 248 255 262 269
+Su 186 193 200 207 214 221 228 235 242 249 256 263 270
+
+ October November December
+Mo 278 285 292 299 306 313 320 327 334 341 348 355 362
+Tu 279 286 293 300 307 314 321 328 335 342 349 356 363
+We 280 287 294 301 308 315 322 329 336 343 350 357 364
+Th 274 281 288 295 302 309 316 323 330 337 344 351 358 365
+Fr 275 282 289 296 303 310 317 324 331 338 345 352 359
+Sa 276 283 290 297 304 311 318 325 332 339 346 353 360
+Su 277 284 291 298 305 312 319 326 333 340 347 354 361
diff --git a/usr.bin/ncal/tests/regress.r-y2009-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2009-md-nhl.out
new file mode 100644
index 0000000..43496e9
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2009-md-nhl.out
@@ -0,0 +1,27 @@
+ 2009
+ January February March April
+Mo 5 12 19 26 2 9 16 23 2 9 16 23 30 6 13 20 27
+Tu 6 13 20 27 3 10 17 24 3 10 17 24 31 7 14 21 28
+We 7 14 21 28 4 11 18 25 4 11 18 25 1 8 15 22 29
+Th 1 8 15 22 29 5 12 19 26 5 12 19 26 2 9 16 23 30
+Fr 2 9 16 23 30 6 13 20 27 6 13 20 27 3 10 17 24
+Sa 3 10 17 24 31 7 14 21 28 7 14 21 28 4 11 18 25
+Su 4 11 18 25 1 8 15 22 1 8 15 22 29 5 12 19 26
+
+ May June July August
+Mo 4 11 18 25 1 8 15 22 29 6 13 20 27 3 10 17 24 31
+Tu 5 12 19 26 2 9 16 23 30 7 14 21 28 4 11 18 25
+We 6 13 20 27 3 10 17 24 1 8 15 22 29 5 12 19 26
+Th 7 14 21 28 4 11 18 25 2 9 16 23 30 6 13 20 27
+Fr 1 8 15 22 29 5 12 19 26 3 10 17 24 31 7 14 21 28
+Sa 2 9 16 23 30 6 13 20 27 4 11 18 25 1 8 15 22 29
+Su 3 10 17 24 31 7 14 21 28 5 12 19 26 2 9 16 23 30
+
+ September October November December
+Mo 7 14 21 28 5 12 19 26 2 9 16 23 30 7 14 21 28
+Tu 1 8 15 22 29 6 13 20 27 3 10 17 24 1 8 15 22 29
+We 2 9 16 23 30 7 14 21 28 4 11 18 25 2 9 16 23 30
+Th 3 10 17 24 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Fr 4 11 18 25 2 9 16 23 30 6 13 20 27 4 11 18 25
+Sa 5 12 19 26 3 10 17 24 31 7 14 21 28 5 12 19 26
+Su 6 13 20 27 4 11 18 25 1 8 15 22 29 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.r-y2010-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2010-jd-nhl.out
new file mode 100644
index 0000000..affd536
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2010-jd-nhl.out
@@ -0,0 +1,36 @@
+ 2010
+ January February March
+Mo 4 11 18 25 32 39 46 53 60 67 74 81 88
+Tu 5 12 19 26 33 40 47 54 61 68 75 82 89
+We 6 13 20 27 34 41 48 55 62 69 76 83 90
+Th 7 14 21 28 35 42 49 56 63 70 77 84
+Fr 1 8 15 22 29 36 43 50 57 64 71 78 85
+Sa 2 9 16 23 30 37 44 51 58 65 72 79 86
+Su 3 10 17 24 31 38 45 52 59 66 73 80 87
+
+ April May June
+Mo 95 102 109 116 123 130 137 144 151 158 165 172 179
+Tu 96 103 110 117 124 131 138 145 152 159 166 173 180
+We 97 104 111 118 125 132 139 146 153 160 167 174 181
+Th 91 98 105 112 119 126 133 140 147 154 161 168 175
+Fr 92 99 106 113 120 127 134 141 148 155 162 169 176
+Sa 93 100 107 114 121 128 135 142 149 156 163 170 177
+Su 94 101 108 115 122 129 136 143 150 157 164 171 178
+
+ July August September
+Mo 186 193 200 207 214 221 228 235 242 249 256 263 270
+Tu 187 194 201 208 215 222 229 236 243 250 257 264 271
+We 188 195 202 209 216 223 230 237 244 251 258 265 272
+Th 182 189 196 203 210 217 224 231 238 245 252 259 266 273
+Fr 183 190 197 204 211 218 225 232 239 246 253 260 267
+Sa 184 191 198 205 212 219 226 233 240 247 254 261 268
+Su 185 192 199 206 213 220 227 234 241 248 255 262 269
+
+ October November December
+Mo 277 284 291 298 305 312 319 326 333 340 347 354 361
+Tu 278 285 292 299 306 313 320 327 334 341 348 355 362
+We 279 286 293 300 307 314 321 328 335 342 349 356 363
+Th 280 287 294 301 308 315 322 329 336 343 350 357 364
+Fr 274 281 288 295 302 309 316 323 330 337 344 351 358 365
+Sa 275 282 289 296 303 310 317 324 331 338 345 352 359
+Su 276 283 290 297 304 311 318 325 332 339 346 353 360
diff --git a/usr.bin/ncal/tests/regress.r-y2010-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2010-md-nhl.out
new file mode 100644
index 0000000..8649c16
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2010-md-nhl.out
@@ -0,0 +1,27 @@
+ 2010
+ January February March April
+Mo 4 11 18 25 1 8 15 22 1 8 15 22 29 5 12 19 26
+Tu 5 12 19 26 2 9 16 23 2 9 16 23 30 6 13 20 27
+We 6 13 20 27 3 10 17 24 3 10 17 24 31 7 14 21 28
+Th 7 14 21 28 4 11 18 25 4 11 18 25 1 8 15 22 29
+Fr 1 8 15 22 29 5 12 19 26 5 12 19 26 2 9 16 23 30
+Sa 2 9 16 23 30 6 13 20 27 6 13 20 27 3 10 17 24
+Su 3 10 17 24 31 7 14 21 28 7 14 21 28 4 11 18 25
+
+ May June July August
+Mo 3 10 17 24 31 7 14 21 28 5 12 19 26 2 9 16 23 30
+Tu 4 11 18 25 1 8 15 22 29 6 13 20 27 3 10 17 24 31
+We 5 12 19 26 2 9 16 23 30 7 14 21 28 4 11 18 25
+Th 6 13 20 27 3 10 17 24 1 8 15 22 29 5 12 19 26
+Fr 7 14 21 28 4 11 18 25 2 9 16 23 30 6 13 20 27
+Sa 1 8 15 22 29 5 12 19 26 3 10 17 24 31 7 14 21 28
+Su 2 9 16 23 30 6 13 20 27 4 11 18 25 1 8 15 22 29
+
+ September October November December
+Mo 6 13 20 27 4 11 18 25 1 8 15 22 29 6 13 20 27
+Tu 7 14 21 28 5 12 19 26 2 9 16 23 30 7 14 21 28
+We 1 8 15 22 29 6 13 20 27 3 10 17 24 1 8 15 22 29
+Th 2 9 16 23 30 7 14 21 28 4 11 18 25 2 9 16 23 30
+Fr 3 10 17 24 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Sa 4 11 18 25 2 9 16 23 30 6 13 20 27 4 11 18 25
+Su 5 12 19 26 3 10 17 24 31 7 14 21 28 5 12 19 26
diff --git a/usr.bin/ncal/tests/regress.r-y2011-jd-nhl.out b/usr.bin/ncal/tests/regress.r-y2011-jd-nhl.out
new file mode 100644
index 0000000..a4a71c2
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2011-jd-nhl.out
@@ -0,0 +1,36 @@
+ 2011
+ January February March
+Mo 3 10 17 24 31 38 45 52 59 66 73 80 87
+Tu 4 11 18 25 32 39 46 53 60 67 74 81 88
+We 5 12 19 26 33 40 47 54 61 68 75 82 89
+Th 6 13 20 27 34 41 48 55 62 69 76 83 90
+Fr 7 14 21 28 35 42 49 56 63 70 77 84
+Sa 1 8 15 22 29 36 43 50 57 64 71 78 85
+Su 2 9 16 23 30 37 44 51 58 65 72 79 86
+
+ April May June
+Mo 94 101 108 115 122 129 136 143 150 157 164 171 178
+Tu 95 102 109 116 123 130 137 144 151 158 165 172 179
+We 96 103 110 117 124 131 138 145 152 159 166 173 180
+Th 97 104 111 118 125 132 139 146 153 160 167 174 181
+Fr 91 98 105 112 119 126 133 140 147 154 161 168 175
+Sa 92 99 106 113 120 127 134 141 148 155 162 169 176
+Su 93 100 107 114 121 128 135 142 149 156 163 170 177
+
+ July August September
+Mo 185 192 199 206 213 220 227 234 241 248 255 262 269
+Tu 186 193 200 207 214 221 228 235 242 249 256 263 270
+We 187 194 201 208 215 222 229 236 243 250 257 264 271
+Th 188 195 202 209 216 223 230 237 244 251 258 265 272
+Fr 182 189 196 203 210 217 224 231 238 245 252 259 266 273
+Sa 183 190 197 204 211 218 225 232 239 246 253 260 267
+Su 184 191 198 205 212 219 226 233 240 247 254 261 268
+
+ October November December
+Mo 276 283 290 297 304 311 318 325 332 339 346 353 360
+Tu 277 284 291 298 305 312 319 326 333 340 347 354 361
+We 278 285 292 299 306 313 320 327 334 341 348 355 362
+Th 279 286 293 300 307 314 321 328 335 342 349 356 363
+Fr 280 287 294 301 308 315 322 329 336 343 350 357 364
+Sa 274 281 288 295 302 309 316 323 330 337 344 351 358 365
+Su 275 282 289 296 303 310 317 324 331 338 345 352 359
diff --git a/usr.bin/ncal/tests/regress.r-y2011-md-nhl.out b/usr.bin/ncal/tests/regress.r-y2011-md-nhl.out
new file mode 100644
index 0000000..8852932
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.r-y2011-md-nhl.out
@@ -0,0 +1,27 @@
+ 2011
+ January February March April
+Mo 3 10 17 24 31 7 14 21 28 7 14 21 28 4 11 18 25
+Tu 4 11 18 25 1 8 15 22 1 8 15 22 29 5 12 19 26
+We 5 12 19 26 2 9 16 23 2 9 16 23 30 6 13 20 27
+Th 6 13 20 27 3 10 17 24 3 10 17 24 31 7 14 21 28
+Fr 7 14 21 28 4 11 18 25 4 11 18 25 1 8 15 22 29
+Sa 1 8 15 22 29 5 12 19 26 5 12 19 26 2 9 16 23 30
+Su 2 9 16 23 30 6 13 20 27 6 13 20 27 3 10 17 24
+
+ May June July August
+Mo 2 9 16 23 30 6 13 20 27 4 11 18 25 1 8 15 22 29
+Tu 3 10 17 24 31 7 14 21 28 5 12 19 26 2 9 16 23 30
+We 4 11 18 25 1 8 15 22 29 6 13 20 27 3 10 17 24 31
+Th 5 12 19 26 2 9 16 23 30 7 14 21 28 4 11 18 25
+Fr 6 13 20 27 3 10 17 24 1 8 15 22 29 5 12 19 26
+Sa 7 14 21 28 4 11 18 25 2 9 16 23 30 6 13 20 27
+Su 1 8 15 22 29 5 12 19 26 3 10 17 24 31 7 14 21 28
+
+ September October November December
+Mo 5 12 19 26 3 10 17 24 31 7 14 21 28 5 12 19 26
+Tu 6 13 20 27 4 11 18 25 1 8 15 22 29 6 13 20 27
+We 7 14 21 28 5 12 19 26 2 9 16 23 30 7 14 21 28
+Th 1 8 15 22 29 6 13 20 27 3 10 17 24 1 8 15 22 29
+Fr 2 9 16 23 30 7 14 21 28 4 11 18 25 2 9 16 23 30
+Sa 3 10 17 24 1 8 15 22 29 5 12 19 26 3 10 17 24 31
+Su 4 11 18 25 2 9 16 23 30 6 13 20 27 4 11 18 25
diff --git a/usr.bin/ncal/tests/regress.s-b-3-nhl.out b/usr.bin/ncal/tests/regress.s-b-3-nhl.out
new file mode 100644
index 0000000..ccb6b36
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-3-nhl.out
@@ -0,0 +1,8 @@
+ February 2008 March 2008 April 2008
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 1 2 3 4 5
+ 3 4 5 6 7 8 9 2 3 4 5 6 7 8 6 7 8 9 10 11 12
+10 11 12 13 14 15 16 9 10 11 12 13 14 15 13 14 15 16 17 18 19
+17 18 19 20 21 22 23 16 17 18 19 20 21 22 20 21 22 23 24 25 26
+24 25 26 27 28 29 23 24 25 26 27 28 29 27 28 29 30
+ 30 31
diff --git a/usr.bin/ncal/tests/regress.s-b-A-nhl.out b/usr.bin/ncal/tests/regress.s-b-A-nhl.out
new file mode 100644
index 0000000..19149ca6
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-A-nhl.out
@@ -0,0 +1,8 @@
+ March 2008 April 2008
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 1 2 3 4 5
+ 2 3 4 5 6 7 8 6 7 8 9 10 11 12
+ 9 10 11 12 13 14 15 13 14 15 16 17 18 19
+16 17 18 19 20 21 22 20 21 22 23 24 25 26
+23 24 25 26 27 28 29 27 28 29 30
+30 31
diff --git a/usr.bin/ncal/tests/regress.s-b-AB-nhl.out b/usr.bin/ncal/tests/regress.s-b-AB-nhl.out
new file mode 100644
index 0000000..ccb6b36
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-AB-nhl.out
@@ -0,0 +1,8 @@
+ February 2008 March 2008 April 2008
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1 1 2 3 4 5
+ 3 4 5 6 7 8 9 2 3 4 5 6 7 8 6 7 8 9 10 11 12
+10 11 12 13 14 15 16 9 10 11 12 13 14 15 13 14 15 16 17 18 19
+17 18 19 20 21 22 23 16 17 18 19 20 21 22 20 21 22 23 24 25 26
+24 25 26 27 28 29 23 24 25 26 27 28 29 27 28 29 30
+ 30 31
diff --git a/usr.bin/ncal/tests/regress.s-b-B-nhl.out b/usr.bin/ncal/tests/regress.s-b-B-nhl.out
new file mode 100644
index 0000000..5d61423
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-B-nhl.out
@@ -0,0 +1,8 @@
+ February 2008 March 2008
+Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
+ 1 2 1
+ 3 4 5 6 7 8 9 2 3 4 5 6 7 8
+10 11 12 13 14 15 16 9 10 11 12 13 14 15
+17 18 19 20 21 22 23 16 17 18 19 20 21 22
+24 25 26 27 28 29 23 24 25 26 27 28 29
+ 30 31
diff --git a/usr.bin/ncal/tests/regress.s-b-gmgy-nhl.out b/usr.bin/ncal/tests/regress.s-b-gmgy-nhl.out
new file mode 100644
index 0000000..5620051
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-gmgy-nhl.out
@@ -0,0 +1,8 @@
+ January 2007
+Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6
+ 7 8 9 10 11 12 13
+14 15 16 17 18 19 20
+21 22 23 24 25 26 27
+28 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.s-b-m-nhl.out b/usr.bin/ncal/tests/regress.s-b-m-nhl.out
new file mode 100644
index 0000000..37b9ffa
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-m-nhl.out
@@ -0,0 +1,8 @@
+ January 2008
+Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5
+ 6 7 8 9 10 11 12
+13 14 15 16 17 18 19
+20 21 22 23 24 25 26
+27 28 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.s-b-mgy-nhl.out b/usr.bin/ncal/tests/regress.s-b-mgy-nhl.out
new file mode 100644
index 0000000..5620051
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-b-mgy-nhl.out
@@ -0,0 +1,8 @@
+ January 2007
+Su Mo Tu We Th Fr Sa
+ 1 2 3 4 5 6
+ 7 8 9 10 11 12 13
+14 15 16 17 18 19 20
+21 22 23 24 25 26 27
+28 29 30 31
+
diff --git a/usr.bin/ncal/tests/regress.s-r-3-nhl.out b/usr.bin/ncal/tests/regress.s-r-3-nhl.out
new file mode 100644
index 0000000..9a816b7
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-3-nhl.out
@@ -0,0 +1,8 @@
+ February 2008 March 2008 April 2008
+Mo 4 11 18 25 3 10 17 24 31 7 14 21 28
+Tu 5 12 19 26 4 11 18 25 1 8 15 22 29
+We 6 13 20 27 5 12 19 26 2 9 16 23 30
+Th 7 14 21 28 6 13 20 27 3 10 17 24
+Fr 1 8 15 22 29 7 14 21 28 4 11 18 25
+Sa 2 9 16 23 1 8 15 22 29 5 12 19 26
+Su 3 10 17 24 2 9 16 23 30 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.s-r-A-nhl.out b/usr.bin/ncal/tests/regress.s-r-A-nhl.out
new file mode 100644
index 0000000..603c2cf
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-A-nhl.out
@@ -0,0 +1,8 @@
+ March 2008 April 2008
+Mo 3 10 17 24 31 7 14 21 28
+Tu 4 11 18 25 1 8 15 22 29
+We 5 12 19 26 2 9 16 23 30
+Th 6 13 20 27 3 10 17 24
+Fr 7 14 21 28 4 11 18 25
+Sa 1 8 15 22 29 5 12 19 26
+Su 2 9 16 23 30 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.s-r-AB-nhl.out b/usr.bin/ncal/tests/regress.s-r-AB-nhl.out
new file mode 100644
index 0000000..9a816b7
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-AB-nhl.out
@@ -0,0 +1,8 @@
+ February 2008 March 2008 April 2008
+Mo 4 11 18 25 3 10 17 24 31 7 14 21 28
+Tu 5 12 19 26 4 11 18 25 1 8 15 22 29
+We 6 13 20 27 5 12 19 26 2 9 16 23 30
+Th 7 14 21 28 6 13 20 27 3 10 17 24
+Fr 1 8 15 22 29 7 14 21 28 4 11 18 25
+Sa 2 9 16 23 1 8 15 22 29 5 12 19 26
+Su 3 10 17 24 2 9 16 23 30 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.s-r-B-nhl.out b/usr.bin/ncal/tests/regress.s-r-B-nhl.out
new file mode 100644
index 0000000..94614da
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-B-nhl.out
@@ -0,0 +1,8 @@
+ February 2008 March 2008
+Mo 4 11 18 25 3 10 17 24 31
+Tu 5 12 19 26 4 11 18 25
+We 6 13 20 27 5 12 19 26
+Th 7 14 21 28 6 13 20 27
+Fr 1 8 15 22 29 7 14 21 28
+Sa 2 9 16 23 1 8 15 22 29
+Su 3 10 17 24 2 9 16 23 30
diff --git a/usr.bin/ncal/tests/regress.s-r-gmgy-nhl.out b/usr.bin/ncal/tests/regress.s-r-gmgy-nhl.out
new file mode 100644
index 0000000..0b42e41
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-gmgy-nhl.out
@@ -0,0 +1,8 @@
+ January 2007
+Mo 1 8 15 22 29
+Tu 2 9 16 23 30
+We 3 10 17 24 31
+Th 4 11 18 25
+Fr 5 12 19 26
+Sa 6 13 20 27
+Su 7 14 21 28
diff --git a/usr.bin/ncal/tests/regress.s-r-m-nhl.out b/usr.bin/ncal/tests/regress.s-r-m-nhl.out
new file mode 100644
index 0000000..34b939d
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-m-nhl.out
@@ -0,0 +1,8 @@
+ January 2008
+Mo 7 14 21 28
+Tu 1 8 15 22 29
+We 2 9 16 23 30
+Th 3 10 17 24 31
+Fr 4 11 18 25
+Sa 5 12 19 26
+Su 6 13 20 27
diff --git a/usr.bin/ncal/tests/regress.s-r-mgy-nhl.out b/usr.bin/ncal/tests/regress.s-r-mgy-nhl.out
new file mode 100644
index 0000000..0b42e41
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.s-r-mgy-nhl.out
@@ -0,0 +1,8 @@
+ January 2007
+Mo 1 8 15 22 29
+Tu 2 9 16 23 30
+We 3 10 17 24 31
+Th 4 11 18 25
+Fr 5 12 19 26
+Sa 6 13 20 27
+Su 7 14 21 28
diff --git a/usr.bin/ncal/tests/regress.sh b/usr.bin/ncal/tests/regress.sh
new file mode 100644
index 0000000..709744f
--- /dev/null
+++ b/usr.bin/ncal/tests/regress.sh
@@ -0,0 +1,80 @@
+# $FreeBSD$
+
+CAL_BIN="ncal"
+CAL="${CAL_BIN} -C"
+NCAL="${CAL_BIN} -N"
+YEARS="2008 2009 2010 2011"
+ONEYEAR="2009"
+
+echo 1..89
+
+REGRESSION_START($1)
+
+#
+# The first tests are layout tests, to make sure that the output is still the
+# same despite varying months.
+#
+
+# Full year calendars
+
+for y in ${YEARS}; do
+ # Regular calendar, Month days, No-highlight
+ REGRESSION_TEST(`r-y${y}-md-nhl', `$NCAL -h ${y}')
+ # Backwards calendar, Month days, No-highlight
+ REGRESSION_TEST(`b-y${y}-md-nhl', `$CAL -h ${y}')
+ # Regular calendar, Julian days, No-highlight
+ REGRESSION_TEST(`r-y${y}-jd-nhl', `$NCAL -jh ${y}')
+ # Backwards calendar, Julian days, No-highlight
+ REGRESSION_TEST(`b-y${y}-jd-nhl', `$CAL -jh ${y}')
+done
+
+# 3 month calendars
+
+for m in $(jot -w %02d 12); do
+ # Regular calendar, Month days, No-highlight
+ REGRESSION_TEST(`r-3m${ONEYEAR}${m}-md-nhl',
+ `$NCAL -h3 ${m} ${ONEYEAR}')
+ # Backwards calendar, Month days, No-highlight
+ REGRESSION_TEST(`b-3m${ONEYEAR}${m}-md-nhl', `$CAL -h3 ${m} ${ONEYEAR}')
+ # Regular calendar, Julian days, No-highlight
+ REGRESSION_TEST(`r-3m${ONEYEAR}${m}-jd-nhl',
+ `$NCAL -jh3 ${m} ${ONEYEAR}')
+ # Backwards calendar, Julian days, No-highlight
+ REGRESSION_TEST(`b-3m${ONEYEAR}${m}-jd-nhl', `$CAL -jh3 ${m} ${ONEYEAR}')
+done
+
+#
+# The next tests are combinations of the various arguments.
+#
+
+# These should fail
+REGRESSION_TEST(`f-3y-nhl', `$NCAL -3 -y 2>&1')
+REGRESSION_TEST(`f-3A-nhl', `$NCAL -3 -A 3 2>&1')
+REGRESSION_TEST(`f-3B-nhl', `$NCAL -3 -B 3 2>&1')
+REGRESSION_TEST(`f-3gy-nhl', `$NCAL -3 2008 2>&1')
+REGRESSION_TEST(`f-3AB-nhl', `$NCAL -3 -A 3 -B 3 2>&1')
+REGRESSION_TEST(`f-mgm-nhl', `$NCAL -m 3 2 2008 2>&1')
+REGRESSION_TEST(`f-ym-nhl', `$NCAL -y -m 2 2>&1')
+REGRESSION_TEST(`f-ygm-nhl', `$NCAL -y 2 2008 2>&1')
+REGRESSION_TEST(`f-yA-nhl', `$NCAL -y -A 3 2>&1')
+REGRESSION_TEST(`f-yB-nhl', `$NCAL -y -B 3 2>&1')
+REGRESSION_TEST(`f-yAB-nhl', `$NCAL -y -A 3 -B 3 2>&1')
+
+# These should be successful
+
+REGRESSION_TEST(`s-b-3-nhl', `$CAL -d 2008.03 -3')
+REGRESSION_TEST(`s-b-A-nhl', `$CAL -d 2008.03 -A 1')
+REGRESSION_TEST(`s-b-B-nhl', `$CAL -d 2008.03 -B 1')
+REGRESSION_TEST(`s-b-AB-nhl', `$CAL -d 2008.03 -A 1 -B 1')
+REGRESSION_TEST(`s-b-m-nhl', `$CAL -d 2008.03 -m 1')
+REGRESSION_TEST(`s-b-mgy-nhl', `$CAL -d 2008.03 -m 1 2007')
+REGRESSION_TEST(`s-b-gmgy-nhl', `$CAL -d 2008.03 1 2007')
+REGRESSION_TEST(`s-r-3-nhl', `$NCAL -d 2008.03 -3')
+REGRESSION_TEST(`s-r-A-nhl', `$NCAL -d 2008.03 -A 1')
+REGRESSION_TEST(`s-r-B-nhl', `$NCAL -d 2008.03 -B 1')
+REGRESSION_TEST(`s-r-AB-nhl', `$NCAL -d 2008.03 -A 1 -B 1')
+REGRESSION_TEST(`s-r-m-nhl', `$NCAL -d 2008.03 -m 1')
+REGRESSION_TEST(`s-r-mgy-nhl', `$NCAL -d 2008.03 -m 1 2007')
+REGRESSION_TEST(`s-r-gmgy-nhl', `$NCAL -d 2008.03 1 2007')
+
+REGRESSION_END()
OpenPOWER on IntegriCloud