Hi tech@, After the recent discussion on jot I noticed there were no tests for it. I looked around and saw that FreeBSD had what looked like decent jot tests, so I brought them into my tree. They appear to have discovered a couple of bugs and I'd like some help in sorting it out. The current state of the suite in my tree is the first patch attached to this email.
There is one piece of low-hanging fruit that I picked early on: the second patch attached fixes a regression in test dddd, which does: $ jot - - - - On OpenBSD this spits out an infinite number of zeros, on FreBSD (and NetBSD) it spits out the integers from 1 .. 100. My patch is what both FreeBSD and NetBSD do (initialize begin, ender, reps, s at compile time). It does not cause additional regressions so far as these tests are concerned, FWIW. I was hoping to say something intelligent at least about the rest of the failures but I'm still slogging through them and it's taking me longer than I'd like. The four dashes bug seemed serious enough to me to warrant bugging you all at this point in the cycle, I apologize in advance if I misjudged. Feedback, comments, criticism most welcome. Pax, -A -- http://haqistan.net/~attila | att...@stalphonsos.com | 0x62A729CF
? 3test.sh Index: Makefile =================================================================== RCS file: Makefile diff -N Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Makefile 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,11 @@ +# $OpenBSD$ + +JOT?=jot + +regress: + m4 regress.m4 regress.sh | env JOT=${JOT} sh + +clean: + rm -f test.*.out + +.include <bsd.regress.mk> Index: regress.ascii.out =================================================================== RCS file: regress.ascii.out diff -N regress.ascii.out Binary files /dev/null and regress.ascii.out differ Index: regress.block.out =================================================================== RCS file: regress.block.out diff -N regress.block.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.block.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,512 @@ +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x Index: regress.dddd.out =================================================================== RCS file: regress.dddd.out diff -N regress.dddd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dddd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +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 +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 +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 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 Index: regress.dddh.out =================================================================== RCS file: regress.dddh.out diff -N regress.dddh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dddh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +1 +3 +5 +7 +9 +11 +13 +15 +17 +19 +21 +23 +25 +27 +29 +31 +33 +35 +37 +39 +41 +43 +45 +47 +49 +51 +53 +55 +57 +59 +61 +63 +65 +67 +69 +71 +73 +75 +77 +79 +81 +83 +85 +87 +89 +91 +93 +95 +97 +99 +101 +103 +105 +107 +109 +111 +113 +115 +117 +119 +121 +123 +125 +127 +129 +131 +133 +135 +137 +139 +141 +143 +145 +147 +149 +151 +153 +155 +157 +159 +161 +163 +165 +167 +169 +171 +173 +175 +177 +179 +181 +183 +185 +187 +189 +191 +193 +195 +197 +199 Index: regress.ddhd.out =================================================================== RCS file: regress.ddhd.out diff -N regress.ddhd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.ddhd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +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 +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 +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 Index: regress.ddhd2.out =================================================================== RCS file: regress.ddhd2.out diff -N regress.ddhd2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.ddhd2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +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 +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 +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 +152 +153 +154 +155 +156 +157 +158 +159 +160 Index: regress.ddhh.out =================================================================== RCS file: regress.ddhh.out diff -N regress.ddhh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.ddhh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +-78 +-76 +-74 +-72 +-70 +-68 +-66 +-64 +-62 +-60 +-58 +-56 +-54 +-52 +-50 +-48 +-46 +-44 +-42 +-40 +-38 +-36 +-34 +-32 +-30 +-28 +-26 +-24 +-22 +-20 +-18 +-16 +-14 +-12 +-10 +-8 +-6 +-4 +-2 +0 +2 +4 +6 +8 +10 +12 +14 +16 +18 +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 Index: regress.ddhh2.out =================================================================== RCS file: regress.ddhh2.out diff -N regress.ddhh2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.ddhh2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +-38 +-36 +-34 +-32 +-30 +-28 +-26 +-24 +-22 +-20 +-18 +-16 +-14 +-12 +-10 +-8 +-6 +-4 +-2 +0 +2 +4 +6 +8 +10 +12 +14 +16 +18 +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 +122 +124 +126 +128 +130 +132 +134 +136 +138 +140 +142 +144 +146 +148 +150 +152 +154 +156 +158 +160 Index: regress.dhdd.out =================================================================== RCS file: regress.dhdd.out diff -N regress.dhdd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dhdd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +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 +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 +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 Index: regress.dhdh.out =================================================================== RCS file: regress.dhdh.out diff -N regress.dhdh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dhdh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,100 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 +122 +124 +126 +128 +130 +132 +134 +136 +138 +140 +142 +144 +146 +148 +150 +152 +154 +156 +158 +160 +162 +164 +166 +168 +170 +172 +174 +176 +178 +180 +182 +184 +186 +188 +190 +192 +194 +196 +198 +200 +202 +204 +206 +208 +210 +212 +214 +216 +218 Index: regress.dhhd.out =================================================================== RCS file: regress.dhhd.out diff -N regress.dhhd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dhhd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,101 @@ +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +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 +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 +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 Index: regress.dhhd2.out =================================================================== RCS file: regress.dhhd2.out diff -N regress.dhhd2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dhhd2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,141 @@ +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +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 +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 +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 +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 +152 +153 +154 +155 +156 +157 +158 +159 +160 Index: regress.dhhh.out =================================================================== RCS file: regress.dhhh.out diff -N regress.dhhh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dhhh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,51 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 Index: regress.dhhh2.out =================================================================== RCS file: regress.dhhh2.out diff -N regress.dhhh2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.dhhh2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,71 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 +122 +124 +126 +128 +130 +132 +134 +136 +138 +140 +142 +144 +146 +148 +150 +152 +154 +156 +158 +160 Index: regress.ed.out =================================================================== RCS file: regress.ed.out diff -N regress.ed.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.ed.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +2s/old/new/ +7s/old/new/ +12s/old/new/ +17s/old/new/ +22s/old/new/ +27s/old/new/ +32s/old/new/ +37s/old/new/ +42s/old/new/ +47s/old/new/ +52s/old/new/ +57s/old/new/ +62s/old/new/ +67s/old/new/ +72s/old/new/ +77s/old/new/ +82s/old/new/ +87s/old/new/ +92s/old/new/ +97s/old/new/ +102s/old/new/ +107s/old/new/ +112s/old/new/ +117s/old/new/ +122s/old/new/ +127s/old/new/ +132s/old/new/ +137s/old/new/ +142s/old/new/ +147s/old/new/ Index: regress.grep.out =================================================================== RCS file: regress.grep.out diff -N regress.grep.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.grep.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1 @@ +................................................................................ Index: regress.hddd.out =================================================================== RCS file: regress.hddd.out diff -N regress.hddd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hddd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +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 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 Index: regress.hddd2.out =================================================================== RCS file: regress.hddd2.out diff -N regress.hddd2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hddd2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +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 Index: regress.hddh.out =================================================================== RCS file: regress.hddh.out diff -N regress.hddh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hddh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +1 +3 +5 +7 +9 +11 +13 +15 +17 +19 +21 +23 +25 +27 +29 +31 +33 +35 +37 +39 +41 +43 +45 +47 +49 +51 +53 +55 +57 +59 +61 +63 +65 +67 +69 +71 +73 +75 +77 +79 +81 +83 +85 +87 +89 +91 +93 +95 +97 +99 Index: regress.hddh2.out =================================================================== RCS file: regress.hddh2.out diff -N regress.hddh2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hddh2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +1 +3 +5 +7 +9 +11 +13 +15 +17 +19 +21 +23 +25 +27 +29 +31 +33 +35 +37 +39 +41 +43 +45 +47 +49 +51 +53 +55 +57 +59 Index: regress.hdhd.out =================================================================== RCS file: regress.hdhd.out diff -N regress.hdhd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hdhd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +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 Index: regress.hdhd2.out =================================================================== RCS file: regress.hdhd2.out diff -N regress.hdhd2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hdhd2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 Index: regress.hdhh.out =================================================================== RCS file: regress.hdhh.out diff -N regress.hdhh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hdhh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 Index: regress.hdhh2.out =================================================================== RCS file: regress.hdhh2.out diff -N regress.hdhh2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hdhh2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 +122 +124 +126 +128 +130 +132 +134 +136 +138 +140 +142 +144 +146 +148 +150 +152 +154 +156 +158 +160 Index: regress.hhdd.out =================================================================== RCS file: regress.hhdd.out diff -N regress.hhdd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhdd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +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 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 Index: regress.hhdd2.out =================================================================== RCS file: regress.hhdd2.out diff -N regress.hhdd2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhdd2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 Index: regress.hhdh.out =================================================================== RCS file: regress.hhdh.out diff -N regress.hhdh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhdh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 Index: regress.hhdh2.out =================================================================== RCS file: regress.hhdh2.out diff -N regress.hhdh2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhdh2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 Index: regress.hhhd.out =================================================================== RCS file: regress.hhhd.out diff -N regress.hhhd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhhd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +47 +49 +51 +53 +55 +57 +59 +61 +63 +65 +67 +69 +71 +73 +75 +77 +79 +81 +83 +85 +87 +89 +91 +93 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 +120 Index: regress.hhhd2.out =================================================================== RCS file: regress.hhhd2.out diff -N regress.hhhd2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhhd2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +20 +25 +30 +34 +39 +44 +49 +54 +59 +63 +68 +73 +78 +83 +88 +92 +97 +102 +107 +112 +117 +121 +126 +131 +136 +141 +146 +150 +155 +160 Index: regress.hhhh.out =================================================================== RCS file: regress.hhhh.out diff -N regress.hhhh.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhhh.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,50 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 +80 +82 +84 +86 +88 +90 +92 +94 +96 +98 +100 +102 +104 +106 +108 +110 +112 +114 +116 +118 Index: regress.hhhh2.out =================================================================== RCS file: regress.hhhh2.out diff -N regress.hhhh2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.hhhh2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,30 @@ +20 +22 +24 +26 +28 +30 +32 +34 +36 +38 +40 +42 +44 +46 +48 +50 +52 +54 +56 +58 +60 +62 +64 +66 +68 +70 +72 +74 +76 +78 Index: regress.m4 =================================================================== RCS file: regress.m4 diff -N regress.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.m4 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,68 @@ +# $OpenBSD$ +# $FreeBSD: head/usr.bin/tests/regress.m4 263227 2014-03-16 08:04:06Z jmmv $ + +dnl Originally /usr/src/usr.bin/tests/regress.m4 on FreeBSD +dnl Merged into jot tests for OpenBSD by att...@stalphonsos.com + +dnl A library of routines for doing regression tests for userland utilities. + +dnl Start up. We initialise the exit status to 0 (no failure) and change +dnl into the directory specified by our first argument, which is the +dnl directory to run the tests inside. + +dnl We need backticks and square brackets, use [[ ]] for m4 quoting +changequote([[,]]) + +dnl Set some things up before we start running tests +define([[REGRESSION_START]], +TESTDIR=$1 +if [ -z "$TESTDIR" ]; then + TESTDIR=. +fi +cd $TESTDIR + +TOTAL=0 +NFAILED=0 +FAILED="" +STATUS=0 +) + +dnl Check $? to see if we passed or failed. The first parameter is the test +dnl which passed or failed. It may be nil. +define([[REGRESSION_PASSFAIL]], +if [ $? -eq 0 ]; then + echo "ok - $1 # Test detected no regression. (in $TESTDIR)" +else + STATUS=$? + NFAILED=`expr 1 + ${NFAILED}` + [ -n "${FAILED}" ] && FAILED="${FAILED} " + FAILED="${FAILED}$1" + SEE_ABOVE="" + if [ ${VERBOSE-0} != 0 ]; then + diff -u ${SRCDIR:-.}/regress.$1.out ./test.$1.out + SEE_ABOVE="See above. " + fi + echo "not ok - $1 # Test failed: regression detected. ${SEE_ABOVE}(in $TESTDIR)" +fi) + +dnl An actual test. The first parameter is the test name. The second is the +dnl command/commands to execute for the actual test. Their exit status is +dnl checked. It is assumed that the test will output to stdout, and that the +dnl output to be used to check for regression will be in regress.TESTNAME.out. +define([[REGRESSION_TEST]], +TOTAL=`expr 1 + ${TOTAL}` +$2 >test.$1.out 2>&1 +diff -q ${SRCDIR:-.}/regress.$1.out ./test.$1.out >/dev/null +REGRESSION_PASSFAIL($1)) + +dnl Cleanup. Exit with the status code of the last failure. Should probably +dnl be the number of failed tests, but hey presto, this is what it does. This +dnl could also clean up potential droppings, if some forms of regression tests +dnl end up using mktemp(1) or such. +define([[REGRESSION_END]], +if [ ${NFAILED} -ne 0 ]; then + echo "FAILED ${NFAILED} tests out of ${TOTAL}: ${FAILED}" +else + echo "PASSED ${TOTAL} tests" +fi +exit $STATUS) Index: regress.n21.out =================================================================== RCS file: regress.n21.out diff -N regress.n21.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.n21.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,21 @@ +-1.00 +-0.90 +-0.80 +-0.70 +-0.60 +-0.50 +-0.40 +-0.30 +-0.20 +-0.10 +-0.00 +0.10 +0.20 +0.30 +0.40 +0.50 +0.60 +0.70 +0.80 +0.90 +1.00 Index: regress.rand1.out =================================================================== RCS file: regress.rand1.out diff -N regress.rand1.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.rand1.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 Index: regress.rand2.out =================================================================== RCS file: regress.rand2.out diff -N regress.rand2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.rand2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 Index: regress.sh =================================================================== RCS file: regress.sh diff -N regress.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.sh 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,70 @@ +# $OpenBSD$ +# $FreeBSD: head/usr.bin/jot/tests/regress.sh 208728 2010-06-02 07:47:29Z brian $ + +JOT=${JOT-jot} +echo "# JOT is ${JOT}" + +REGRESSION_START(`pwd`) + +REGRESSION_TEST([[x]], [[${JOT} -w "%X" -s , 100 1 200]]) +REGRESSION_TEST([[hhhh]], [[${JOT} 50 20 120 2]]) +REGRESSION_TEST([[hhhd]], [[${JOT} 50 20 120 -]]) +REGRESSION_TEST([[hhdh]], [[${JOT} 50 20 - 2]]) +REGRESSION_TEST([[hhdd]], [[${JOT} 50 20 - -]]) +REGRESSION_TEST([[hdhh]], [[${JOT} 50 - 120 2]]) +REGRESSION_TEST([[hdhd]], [[${JOT} 50 - 120 -]]) +REGRESSION_TEST([[hddh]], [[${JOT} 50 - - 2]]) +REGRESSION_TEST([[hddd]], [[${JOT} 50 - - -]]) +REGRESSION_TEST([[dhhh]], [[${JOT} - 20 120 2]]) +REGRESSION_TEST([[dhhd]], [[${JOT} - 20 120 -]]) +REGRESSION_TEST([[dhdh]], [[${JOT} - 20 - 2]]) +REGRESSION_TEST([[dhdd]], [[${JOT} - 20 - -]]) +REGRESSION_TEST([[ddhh]], [[${JOT} - - 120 2]]) +REGRESSION_TEST([[ddhd]], [[${JOT} - - 120 -]]) +REGRESSION_TEST([[dddh]], [[${JOT} - - - 2]]) +REGRESSION_TEST([[dddd]], [[${JOT} - - - -]]) +REGRESSION_TEST([[hhhh2]], [[${JOT} 30 20 160 2]]) +REGRESSION_TEST([[hhhd2]], [[${JOT} 30 20 160 -]]) +REGRESSION_TEST([[hhdh2]], [[${JOT} 30 20 - 2]]) +REGRESSION_TEST([[hhdd2]], [[${JOT} 30 20 - -]]) +REGRESSION_TEST([[hdhh2]], [[${JOT} 30 - 160 2]]) +REGRESSION_TEST([[hdhd2]], [[${JOT} 30 - 160 -]]) +REGRESSION_TEST([[hddh2]], [[${JOT} 30 - - 2]]) +REGRESSION_TEST([[hddd2]], [[${JOT} 30 - - -]]) +REGRESSION_TEST([[dhhh2]], [[${JOT} - 20 160 2]]) +REGRESSION_TEST([[dhhd2]], [[${JOT} - 20 160 -]]) +REGRESSION_TEST([[ddhh2]], [[${JOT} - - 160 2]]) +REGRESSION_TEST([[rand1]], [[${JOT} -r 10000 0 9 | sort -u]]) +REGRESSION_TEST([[rand2]], [[${JOT} -r 10000 9 0 | sort -u]]) +REGRESSION_TEST([[n21]], [[${JOT} 21 -1 1.00]]) +REGRESSION_TEST([[ascii]], [[${JOT} -c 128 0]]) +REGRESSION_TEST([[xaa]], [[${JOT} -w xa%c 26 a]]) +REGRESSION_TEST([[yes]], [[${JOT} -b yes 10]]) +REGRESSION_TEST([[ed]], [[${JOT} -w %ds/old/new/ 30 2 - 5]]) +REGRESSION_TEST([[stutter]], [[${JOT} - 9 0 -.5]]) +REGRESSION_TEST([[stutter2]], [[${JOT} -w %d - 9.5 0 -.5]]) +REGRESSION_TEST([[block]], [[${JOT} -b x 512]]) +REGRESSION_TEST([[tabs]], [[${JOT} -s, - 10 132 4]]) +REGRESSION_TEST([[grep]], [[${JOT} -s "" -b . 80]]) +REGRESSION_TEST([[wf]], [[${JOT} -w "a%.1fb" 10]]) +REGRESSION_TEST([[we]], [[${JOT} -w "a%eb" 10]]) +REGRESSION_TEST([[wwe]], [[${JOT} -w "a%-15eb" 10]]) +REGRESSION_TEST([[wg]], [[${JOT} -w "a%20gb" 10]]) +REGRESSION_TEST([[wc]], [[${JOT} -w "a%cb" 10 33 43]]) +REGRESSION_TEST([[wgd]], [[${JOT} -w "a%gb" 10 .2]]) +REGRESSION_TEST([[wu]], [[${JOT} -w "a%ub" 10]]) +REGRESSION_TEST([[wo]], [[${JOT} -w "a%ob" 10]]) +REGRESSION_TEST([[wx]], [[${JOT} -w "a%xb" 10]]) +REGRESSION_TEST([[wX1]], [[${JOT} -w "a%Xb" 10]]) +REGRESSION_TEST([[wXl]], [[${JOT} -w "a%Xb" 10 2147483648]]) +REGRESSION_TEST([[wdl]], [[${JOT} -w "a%db" 10 2147483648 2>/dev/null]]) +REGRESSION_TEST([[wxn]], [[${JOT} -w "a%xb" 10 -5 2>/dev/null]]) +REGRESSION_TEST([[wdn]], [[${JOT} -w "a%db" 10 -5]]) +REGRESSION_TEST([[wp1]], [[${JOT} -w "%%%d%%%%" 10]]) +REGRESSION_TEST([[wp2]], [[${JOT} -w "%d%%d%%" 10]]) +REGRESSION_TEST([[wp3]], [[${JOT} -w "a%%A%%%d%%B%%b" 10]]) +REGRESSION_TEST([[wp4]], [[${JOT} -w "%%d%d%%d%%" 10]]) +REGRESSION_TEST([[wp5]], [[${JOT} -w ftp://www.example.com/pub/uploaded%%20files/disk%03d.iso 10]]) +REGRESSION_TEST([[wp6]], [[${JOT} -w "%d%" 10]]) + +REGRESSION_END() Index: regress.stutter.out =================================================================== RCS file: regress.stutter.out diff -N regress.stutter.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.stutter.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,19 @@ +9 +8 +8 +8 +7 +6 +6 +6 +5 +4 +4 +4 +3 +2 +2 +2 +1 +0 +0 Index: regress.stutter2.out =================================================================== RCS file: regress.stutter2.out diff -N regress.stutter2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.stutter2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,20 @@ +9 +9 +8 +8 +7 +7 +6 +6 +5 +5 +4 +4 +3 +3 +2 +2 +1 +1 +0 +0 Index: regress.tabs.out =================================================================== RCS file: regress.tabs.out diff -N regress.tabs.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.tabs.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1 @@ +10,14,18,22,26,30,34,38,42,46,50,54,58,62,66,70,74,78,82,86,90,94,98,102,106,110,114,118,122,126,130 Index: regress.wX1.out =================================================================== RCS file: regress.wX1.out diff -N regress.wX1.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wX1.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1b +a2b +a3b +a4b +a5b +a6b +a7b +a8b +a9b +aAb Index: regress.wXl.out =================================================================== RCS file: regress.wXl.out diff -N regress.wXl.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wXl.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a80000000b +a80000001b +a80000002b +a80000003b +a80000004b +a80000005b +a80000006b +a80000007b +a80000008b +a80000009b Index: regress.wc.out =================================================================== RCS file: regress.wc.out diff -N regress.wc.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wc.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a!b +a"b +a#b +a$b +a%b +a&b +a'b +a(b +a)b +a+b Index: regress.wdl.out =================================================================== RCS file: regress.wdl.out diff -N regress.wdl.out Index: regress.wdn.out =================================================================== RCS file: regress.wdn.out diff -N regress.wdn.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wdn.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a-5b +a-4b +a-3b +a-2b +a-1b +a0b +a1b +a2b +a3b +a4b Index: regress.we.out =================================================================== RCS file: regress.we.out diff -N regress.we.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.we.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1.000000e+00b +a2.000000e+00b +a3.000000e+00b +a4.000000e+00b +a5.000000e+00b +a6.000000e+00b +a7.000000e+00b +a8.000000e+00b +a9.000000e+00b +a1.000000e+01b Index: regress.wf.out =================================================================== RCS file: regress.wf.out diff -N regress.wf.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wf.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1.0b +a2.0b +a3.0b +a4.0b +a5.0b +a6.0b +a7.0b +a8.0b +a9.0b +a10.0b Index: regress.wg.out =================================================================== RCS file: regress.wg.out diff -N regress.wg.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wg.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a 1b +a 2b +a 3b +a 4b +a 5b +a 6b +a 7b +a 8b +a 9b +a 10b Index: regress.wgd.out =================================================================== RCS file: regress.wgd.out diff -N regress.wgd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wgd.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a0.2b +a1.2b +a2.2b +a3.2b +a4.2b +a5.2b +a6.2b +a7.2b +a8.2b +a9.2b Index: regress.wo.out =================================================================== RCS file: regress.wo.out diff -N regress.wo.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wo.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1b +a2b +a3b +a4b +a5b +a6b +a7b +a10b +a11b +a12b Index: regress.wp1.out =================================================================== RCS file: regress.wp1.out diff -N regress.wp1.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wp1.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +%1%% +%2%% +%3%% +%4%% +%5%% +%6%% +%7%% +%8%% +%9%% +%10%% Index: regress.wp2.out =================================================================== RCS file: regress.wp2.out diff -N regress.wp2.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wp2.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +1%d% +2%d% +3%d% +4%d% +5%d% +6%d% +7%d% +8%d% +9%d% +10%d% Index: regress.wp3.out =================================================================== RCS file: regress.wp3.out diff -N regress.wp3.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wp3.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a%A%1%B%b +a%A%2%B%b +a%A%3%B%b +a%A%4%B%b +a%A%5%B%b +a%A%6%B%b +a%A%7%B%b +a%A%8%B%b +a%A%9%B%b +a%A%10%B%b Index: regress.wp4.out =================================================================== RCS file: regress.wp4.out diff -N regress.wp4.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wp4.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +%d1%d% +%d2%d% +%d3%d% +%d4%d% +%d5%d% +%d6%d% +%d7%d% +%d8%d% +%d9%d% +%d10%d% Index: regress.wp5.out =================================================================== RCS file: regress.wp5.out diff -N regress.wp5.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wp5.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +ftp://www.example.com/pub/uploaded%20files/disk001.iso +ftp://www.example.com/pub/uploaded%20files/disk002.iso +ftp://www.example.com/pub/uploaded%20files/disk003.iso +ftp://www.example.com/pub/uploaded%20files/disk004.iso +ftp://www.example.com/pub/uploaded%20files/disk005.iso +ftp://www.example.com/pub/uploaded%20files/disk006.iso +ftp://www.example.com/pub/uploaded%20files/disk007.iso +ftp://www.example.com/pub/uploaded%20files/disk008.iso +ftp://www.example.com/pub/uploaded%20files/disk009.iso +ftp://www.example.com/pub/uploaded%20files/disk010.iso Index: regress.wp6.out =================================================================== RCS file: regress.wp6.out diff -N regress.wp6.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wp6.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +1% +2% +3% +4% +5% +6% +7% +8% +9% +10% Index: regress.wu.out =================================================================== RCS file: regress.wu.out diff -N regress.wu.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wu.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1b +a2b +a3b +a4b +a5b +a6b +a7b +a8b +a9b +a10b Index: regress.wwe.out =================================================================== RCS file: regress.wwe.out diff -N regress.wwe.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wwe.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1.000000e+00 b +a2.000000e+00 b +a3.000000e+00 b +a4.000000e+00 b +a5.000000e+00 b +a6.000000e+00 b +a7.000000e+00 b +a8.000000e+00 b +a9.000000e+00 b +a1.000000e+01 b Index: regress.wx.out =================================================================== RCS file: regress.wx.out diff -N regress.wx.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.wx.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +a1b +a2b +a3b +a4b +a5b +a6b +a7b +a8b +a9b +aab Index: regress.wxn.out =================================================================== RCS file: regress.wxn.out diff -N regress.wxn.out Index: regress.x.out =================================================================== RCS file: regress.x.out diff -N regress.x.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.x.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1 @@ +1,3,5,7,9,B,D,F,11,13,15,17,19,1B,1D,1F,21,23,25,27,29,2B,2D,2F,31,33,35,37,39,3B,3D,3F,41,43,45,47,49,4B,4D,4F,51,53,55,57,59,5B,5D,5F,61,63,65,67,69,6B,6D,6F,71,73,75,77,79,7B,7D,7F,81,83,85,87,89,8B,8D,8F,91,93,95,97,99,9B,9D,9F,A1,A3,A5,A7,A9,AB,AD,AF,B1,B3,B5,B7,B9,BB,BD,BF,C1,C3,C5,C8 Index: regress.xaa.out =================================================================== RCS file: regress.xaa.out diff -N regress.xaa.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.xaa.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,26 @@ +xaa +xab +xac +xad +xae +xaf +xag +xah +xai +xaj +xak +xal +xam +xan +xao +xap +xaq +xar +xas +xat +xau +xav +xaw +xax +xay +xaz Index: regress.yes.out =================================================================== RCS file: regress.yes.out diff -N regress.yes.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ regress.yes.out 22 Jul 2016 21:15:38 -0000 @@ -0,0 +1,10 @@ +yes +yes +yes +yes +yes +yes +yes +yes +yes +yes
Index: jot.c =================================================================== RCS file: /cvs/src/usr.bin/jot/jot.c,v retrieving revision 1.28 diff -u -p -r1.28 jot.c --- jot.c 17 Jul 2016 04:04:46 -0000 1.28 +++ jot.c 22 Jul 2016 20:52:55 -0000 @@ -54,10 +54,10 @@ #define is_default(s) (strcmp((s), "-") == 0) -static double begin; -static double ender; -static double s; -static long reps; +static double begin = BEGIN_DEF; +static double ender = ENDER_DEF; +static double s = STEP_DEF; +static long reps = REPS_DEF; static bool randomize; static bool infinity; static bool boring;