24 files changed, 68 insertions, 10 deletions

diff --git a/tools/regression/usr.bin/calendar/calendar.calibrate b/tools/regression/usr.bin/calendar/calendar.calibrate
index 84534b785e71..28e7e4a42268 100644
--- a/tools/regression/usr.bin/calendar/calendar.calibrate
+++ b/tools/regression/usr.bin/calendar/calendar.calibrate
@@ -3,6 +3,9 @@
  *
  * $FreeBSD$
  */
+
+LANG=C
+
 01/01	jan 1
 01/02	jan 2
 01/03	jan 3
diff --git a/tools/regression/usr.bin/calendar/regress.a2.out b/tools/regression/usr.bin/calendar/regress.a2.out
index eea874869094..0fed38ba2486 100644
--- a/tools/regression/usr.bin/calendar/regress.a2.out
+++ b/tools/regression/usr.bin/calendar/regress.a2.out
@@ -1,4 +1,4 @@
-Jan  1 	jan 1
 Dec 29 	dec 29
 Dec 30 	dec 30
 Dec 31 	dec 31
+Jan  1 	jan 1
diff --git a/tools/regression/usr.bin/calendar/regress.a3.out b/tools/regression/usr.bin/calendar/regress.a3.out
index 685059d2d4fb..9dabd3393352 100644
--- a/tools/regression/usr.bin/calendar/regress.a3.out
+++ b/tools/regression/usr.bin/calendar/regress.a3.out
@@ -1,4 +1,4 @@
-Jan  1 	jan 1
-Jan  2 	jan 2
 Dec 30 	dec 30
 Dec 31 	dec 31
+Jan  1 	jan 1
+Jan  2 	jan 2
diff --git a/tools/regression/usr.bin/calendar/regress.a4.out b/tools/regression/usr.bin/calendar/regress.a4.out
index 91136bb6c4cf..e3756b11f2b4 100644
--- a/tools/regression/usr.bin/calendar/regress.a4.out
+++ b/tools/regression/usr.bin/calendar/regress.a4.out
@@ -1,4 +1,4 @@
+Dec 31 	dec 31
 Jan  1 	jan 1
 Jan  2 	jan 2
 Jan  3 	jan 3
-Dec 31 	dec 31
diff --git a/tools/regression/usr.bin/calendar/regress.b2.out b/tools/regression/usr.bin/calendar/regress.b2.out
index eea874869094..0fed38ba2486 100644
--- a/tools/regression/usr.bin/calendar/regress.b2.out
+++ b/tools/regression/usr.bin/calendar/regress.b2.out
@@ -1,4 +1,4 @@
-Jan  1 	jan 1
 Dec 29 	dec 29
 Dec 30 	dec 30
 Dec 31 	dec 31
+Jan  1 	jan 1
diff --git a/tools/regression/usr.bin/calendar/regress.b3.out b/tools/regression/usr.bin/calendar/regress.b3.out
index 685059d2d4fb..9dabd3393352 100644
--- a/tools/regression/usr.bin/calendar/regress.b3.out
+++ b/tools/regression/usr.bin/calendar/regress.b3.out
@@ -1,4 +1,4 @@
-Jan  1 	jan 1
-Jan  2 	jan 2
 Dec 30 	dec 30
 Dec 31 	dec 31
+Jan  1 	jan 1
+Jan  2 	jan 2
diff --git a/tools/regression/usr.bin/calendar/regress.b4.out b/tools/regression/usr.bin/calendar/regress.b4.out
index 91136bb6c4cf..e3756b11f2b4 100644
--- a/tools/regression/usr.bin/calendar/regress.b4.out
+++ b/tools/regression/usr.bin/calendar/regress.b4.out
@@ -1,4 +1,4 @@
+Dec 31 	dec 31
 Jan  1 	jan 1
 Jan  2 	jan 2
 Jan  3 	jan 3
-Dec 31 	dec 31
diff --git a/tools/regression/usr.bin/calendar/regress.s1.out b/tools/regression/usr.bin/calendar/regress.s1.out
index eea874869094..0fed38ba2486 100644
--- a/tools/regression/usr.bin/calendar/regress.s1.out
+++ b/tools/regression/usr.bin/calendar/regress.s1.out
@@ -1,4 +1,4 @@
-Jan  1 	jan 1
 Dec 29 	dec 29
 Dec 30 	dec 30
 Dec 31 	dec 31
+Jan  1 	jan 1
diff --git a/tools/regression/usr.bin/calendar/regress.s3.out b/tools/regression/usr.bin/calendar/regress.s3.out
index 1cf16ef626a2..0c6120786ad0 100644
--- a/tools/regression/usr.bin/calendar/regress.s3.out
+++ b/tools/regression/usr.bin/calendar/regress.s3.out
@@ -1,2 +1,2 @@
-Jan  1 	jan 1
 Dec 31 	dec 31
+Jan  1 	jan 1
diff --git a/tools/regression/usr.bin/calendar/regress.sh b/tools/regression/usr.bin/calendar/regress.sh
index bd305f0cf89a..743eb95e7f98 100644
--- a/tools/regression/usr.bin/calendar/regress.sh
+++ b/tools/regression/usr.bin/calendar/regress.sh
@@ -30,4 +30,24 @@ REGRESSION_TEST(`b3',`$CALENDAR -B 3 -t 02.01.2007')
 REGRESSION_TEST(`b4',`$CALENDAR -B 3 -t 03.01.2007')
 REGRESSION_TEST(`b5',`$CALENDAR -B 3 -t 04.01.2007')
 
+echo 15..21
+
+REGRESSION_TEST(`w0-1',`$CALENDAR -W 0 -t 28.12.2006')
+REGRESSION_TEST(`w0-2',`$CALENDAR -W 0 -t 29.12.2006')
+REGRESSION_TEST(`w0-3',`$CALENDAR -W 0 -t 30.12.2006')
+REGRESSION_TEST(`w0-4',`$CALENDAR -W 0 -t 31.12.2006')
+REGRESSION_TEST(`w0-5',`$CALENDAR -W 0 -t 01.01.2007')
+REGRESSION_TEST(`w0-6',`$CALENDAR -W 0 -t 02.01.2007')
+REGRESSION_TEST(`w0-7',`$CALENDAR -W 0 -t 03.01.2007')
+
+echo 22..28
+
+REGRESSION_TEST(`wn-1',`$CALENDAR -W 0 -t 28.12.2006')
+REGRESSION_TEST(`wn-2',`$CALENDAR -W 1 -t 28.12.2006')
+REGRESSION_TEST(`wn-3',`$CALENDAR -W 2 -t 28.12.2006')
+REGRESSION_TEST(`wn-4',`$CALENDAR -W 3 -t 28.12.2006')
+REGRESSION_TEST(`wn-5',`$CALENDAR -W 4 -t 28.12.2006')
+REGRESSION_TEST(`wn-6',`$CALENDAR -W 5 -t 28.12.2006')
+REGRESSION_TEST(`wn-7',`$CALENDAR -W 6 -t 28.12.2006')
+
 REGRESSION_END()
diff --git a/tools/regression/usr.bin/calendar/regress.w0-1.out b/tools/regression/usr.bin/calendar/regress.w0-1.out
new file mode 100644
index 000000000000..5bd407202318
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-1.out
@@ -0,0 +1 @@
+Dec 28 	dec 28
diff --git a/tools/regression/usr.bin/calendar/regress.w0-2.out b/tools/regression/usr.bin/calendar/regress.w0-2.out
new file mode 100644
index 000000000000..66e70639ce56
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-2.out
@@ -0,0 +1 @@
+Dec 29 	dec 29
diff --git a/tools/regression/usr.bin/calendar/regress.w0-3.out b/tools/regression/usr.bin/calendar/regress.w0-3.out
new file mode 100644
index 000000000000..03073eee3a4b
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-3.out
@@ -0,0 +1 @@
+Dec 30 	dec 30
diff --git a/tools/regression/usr.bin/calendar/regress.w0-4.out b/tools/regression/usr.bin/calendar/regress.w0-4.out
new file mode 100644
index 000000000000..a14f6b68b2fa
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-4.out
@@ -0,0 +1 @@
+Dec 31 	dec 31
diff --git a/tools/regression/usr.bin/calendar/regress.w0-5.out b/tools/regression/usr.bin/calendar/regress.w0-5.out
new file mode 100644
index 000000000000..1232b9b2d9ec
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-5.out
@@ -0,0 +1 @@
+Jan  1 	jan 1
diff --git a/tools/regression/usr.bin/calendar/regress.w0-6.out b/tools/regression/usr.bin/calendar/regress.w0-6.out
new file mode 100644
index 000000000000..b3545a21bd9a
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-6.out
@@ -0,0 +1 @@
+Jan  2 	jan 2
diff --git a/tools/regression/usr.bin/calendar/regress.w0-7.out b/tools/regression/usr.bin/calendar/regress.w0-7.out
new file mode 100644
index 000000000000..6449760481f6
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.w0-7.out
@@ -0,0 +1 @@
+Jan  3 	jan 3
diff --git a/tools/regression/usr.bin/calendar/regress.wn-1.out b/tools/regression/usr.bin/calendar/regress.wn-1.out
new file mode 100644
index 000000000000..5bd407202318
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-1.out
@@ -0,0 +1 @@
+Dec 28 	dec 28
diff --git a/tools/regression/usr.bin/calendar/regress.wn-2.out b/tools/regression/usr.bin/calendar/regress.wn-2.out
new file mode 100644
index 000000000000..84a2b33a2969
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-2.out
@@ -0,0 +1,2 @@
+Dec 28 	dec 28
+Dec 29 	dec 29
diff --git a/tools/regression/usr.bin/calendar/regress.wn-3.out b/tools/regression/usr.bin/calendar/regress.wn-3.out
new file mode 100644
index 000000000000..7f027e59a8fe
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-3.out
@@ -0,0 +1,3 @@
+Dec 28 	dec 28
+Dec 29 	dec 29
+Dec 30 	dec 30
diff --git a/tools/regression/usr.bin/calendar/regress.wn-4.out b/tools/regression/usr.bin/calendar/regress.wn-4.out
new file mode 100644
index 000000000000..ef3d71db5e57
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-4.out
@@ -0,0 +1,4 @@
+Dec 28 	dec 28
+Dec 29 	dec 29
+Dec 30 	dec 30
+Dec 31 	dec 31
diff --git a/tools/regression/usr.bin/calendar/regress.wn-5.out b/tools/regression/usr.bin/calendar/regress.wn-5.out
new file mode 100644
index 000000000000..c38c00b86cef
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-5.out
@@ -0,0 +1,5 @@
+Dec 28 	dec 28
+Dec 29 	dec 29
+Dec 30 	dec 30
+Dec 31 	dec 31
+Jan  1 	jan 1
diff --git a/tools/regression/usr.bin/calendar/regress.wn-6.out b/tools/regression/usr.bin/calendar/regress.wn-6.out
new file mode 100644
index 000000000000..63c99fe44e6e
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-6.out
@@ -0,0 +1,6 @@
+Dec 28 	dec 28
+Dec 29 	dec 29
+Dec 30 	dec 30
+Dec 31 	dec 31
+Jan  1 	jan 1
+Jan  2 	jan 2
diff --git a/tools/regression/usr.bin/calendar/regress.wn-7.out b/tools/regression/usr.bin/calendar/regress.wn-7.out
new file mode 100644
index 000000000000..4b48f68101c3
--- /dev/null
+++ b/tools/regression/usr.bin/calendar/regress.wn-7.out
@@ -0,0 +1,7 @@
+Dec 28 	dec 28
+Dec 29 	dec 29
+Dec 30 	dec 30
+Dec 31 	dec 31
+Jan  1 	jan 1
+Jan  2 	jan 2
+Jan  3 	jan 3