From: Karel Zak Date: Mon, 22 Jan 2018 14:59:06 +0000 (+0100) Subject: tests: merge year cal(1) tests X-Git-Tag: v2.32-rc1~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b9138d9526e3755301cd3db0c934a49a100bc6f;p=thirdparty%2Futil-linux.git tests: merge year cal(1) tests * merge tests * use subtests for cal(1) calls Signed-off-by: Karel Zak --- diff --git a/tests/expected/cal/year b/tests/expected/cal/year deleted file mode 100644 index 0fd88d3dc1..0000000000 --- a/tests/expected/cal/year +++ /dev/null @@ -1,177 +0,0 @@ - -Gregorian - Monday-based week - 2006 - - January February March -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 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 -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 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 -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 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 -Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su - 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 - -Gregorian - Sunday-based week - 2006 - - 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 6 7 1 2 3 4 1 2 3 4 - 8 9 10 11 12 13 14 5 6 7 8 9 10 11 5 6 7 8 9 10 11 -15 16 17 18 19 20 21 12 13 14 15 16 17 18 12 13 14 15 16 17 18 -22 23 24 25 26 27 28 19 20 21 22 23 24 25 19 20 21 22 23 24 25 -29 30 31 26 27 28 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 1 2 3 4 5 6 1 2 3 - 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 - 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 -16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 -23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 -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 1 2 3 4 5 1 2 - 2 3 4 5 6 7 8 6 7 8 9 10 11 12 3 4 5 6 7 8 9 - 9 10 11 12 13 14 15 13 14 15 16 17 18 19 10 11 12 13 14 15 16 -16 17 18 19 20 21 22 20 21 22 23 24 25 26 17 18 19 20 21 22 23 -23 24 25 26 27 28 29 27 28 29 30 31 24 25 26 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 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 - -Julian - Monday-based week - 2006 - - January February -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 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 -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 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 -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -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 -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 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 -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 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 -Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 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 - - -Julian - Sunday-based week - 2006 - - January February -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 2 3 4 5 6 7 32 33 34 35 - 8 9 10 11 12 13 14 36 37 38 39 40 41 42 - 15 16 17 18 19 20 21 43 44 45 46 47 48 49 - 22 23 24 25 26 27 28 50 51 52 53 54 55 56 - 29 30 31 57 58 59 - - March April -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 60 61 62 63 91 - 64 65 66 67 68 69 70 92 93 94 95 96 97 98 - 71 72 73 74 75 76 77 99 100 101 102 103 104 105 - 78 79 80 81 82 83 84 106 107 108 109 110 111 112 - 85 86 87 88 89 90 113 114 115 116 117 118 119 - 120 - May June -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 121 122 123 124 125 126 152 153 154 -127 128 129 130 131 132 133 155 156 157 158 159 160 161 -134 135 136 137 138 139 140 162 163 164 165 166 167 168 -141 142 143 144 145 146 147 169 170 171 172 173 174 175 -148 149 150 151 176 177 178 179 180 181 - - July August -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 182 213 214 215 216 217 -183 184 185 186 187 188 189 218 219 220 221 222 223 224 -190 191 192 193 194 195 196 225 226 227 228 229 230 231 -197 198 199 200 201 202 203 232 233 234 235 236 237 238 -204 205 206 207 208 209 210 239 240 241 242 243 -211 212 - September October -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 244 245 274 275 276 277 278 279 280 -246 247 248 249 250 251 252 281 282 283 284 285 286 287 -253 254 255 256 257 258 259 288 289 290 291 292 293 294 -260 261 262 263 264 265 266 295 296 297 298 299 300 301 -267 268 269 270 271 272 273 302 303 304 - - November December -Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 305 306 307 308 335 336 -309 310 311 312 313 314 315 337 338 339 340 341 342 343 -316 317 318 319 320 321 322 344 345 346 347 348 349 350 -323 324 325 326 327 328 329 351 352 353 354 355 356 357 -330 331 332 333 334 358 359 360 361 362 363 364 - 365 - diff --git a/tests/expected/cal/year-ym b/tests/expected/cal/year-ym new file mode 100644 index 0000000000..7aa10faa7e --- /dev/null +++ b/tests/expected/cal/year-ym @@ -0,0 +1,36 @@ +Gregorian - Monday-based week + 2006 + + January February March +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 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 +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 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 +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 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 +Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su + 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/tests/expected/cal/year-ymj b/tests/expected/cal/year-ymj new file mode 100644 index 0000000000..7f68e711ce --- /dev/null +++ b/tests/expected/cal/year-ymj @@ -0,0 +1,52 @@ +Julian - Monday-based week + 2006 + + January February +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 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 +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 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 +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +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 +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 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 +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 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 +Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 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/tests/expected/cal/year-ymjw b/tests/expected/cal/year-ymjw new file mode 100644 index 0000000000..70ad91a0f1 --- /dev/null +++ b/tests/expected/cal/year-ymjw @@ -0,0 +1,52 @@ +Julian - Monday-based week with week numbers + 2006 + + January February + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +52 1 5 32 33 34 35 36 + 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 + 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 + 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 + 4 23 24 25 26 27 28 29 9 58 59 + 5 30 31 + March April + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun + 9 60 61 62 63 64 13 91 92 +10 65 66 67 68 69 70 71 14 93 94 95 96 97 98 99 +11 72 73 74 75 76 77 78 15 100 101 102 103 104 105 106 +12 79 80 81 82 83 84 85 16 107 108 109 110 111 112 113 +13 86 87 88 89 90 17 114 115 116 117 118 119 120 + + May June + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +18 121 122 123 124 125 126 127 22 152 153 154 155 +19 128 129 130 131 132 133 134 23 156 157 158 159 160 161 162 +20 135 136 137 138 139 140 141 24 163 164 165 166 167 168 169 +21 142 143 144 145 146 147 148 25 170 171 172 173 174 175 176 +22 149 150 151 26 177 178 179 180 181 + + July August + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +26 182 183 31 213 214 215 216 217 218 +27 184 185 186 187 188 189 190 32 219 220 221 222 223 224 225 +28 191 192 193 194 195 196 197 33 226 227 228 229 230 231 232 +29 198 199 200 201 202 203 204 34 233 234 235 236 237 238 239 +30 205 206 207 208 209 210 211 35 240 241 242 243 +31 212 + September October + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +35 244 245 246 39 274 +36 247 248 249 250 251 252 253 40 275 276 277 278 279 280 281 +37 254 255 256 257 258 259 260 41 282 283 284 285 286 287 288 +38 261 262 263 264 265 266 267 42 289 290 291 292 293 294 295 +39 268 269 270 271 272 273 43 296 297 298 299 300 301 302 + 44 303 304 + November December + Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun +44 305 306 307 308 309 48 335 336 337 +45 310 311 312 313 314 315 316 49 338 339 340 341 342 343 344 +46 317 318 319 320 321 322 323 50 345 346 347 348 349 350 351 +47 324 325 326 327 328 329 330 51 352 353 354 355 356 357 358 +48 331 332 333 334 52 359 360 361 362 363 364 365 + + diff --git a/tests/expected/cal/year-ymw b/tests/expected/cal/year-ymw new file mode 100644 index 0000000000..01d4364e7f --- /dev/null +++ b/tests/expected/cal/year-ymw @@ -0,0 +1,36 @@ +Gregorian - Monday-based week with week numbers + 2006 + + January February March + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +52 1 5 1 2 3 4 5 9 1 2 3 4 5 + 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 10 6 7 8 9 10 11 12 + 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 11 13 14 15 16 17 18 19 + 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 12 20 21 22 23 24 25 26 + 4 23 24 25 26 27 28 29 9 27 28 13 27 28 29 30 31 + 5 30 31 + April May June + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +13 1 2 18 1 2 3 4 5 6 7 22 1 2 3 4 +14 3 4 5 6 7 8 9 19 8 9 10 11 12 13 14 23 5 6 7 8 9 10 11 +15 10 11 12 13 14 15 16 20 15 16 17 18 19 20 21 24 12 13 14 15 16 17 18 +16 17 18 19 20 21 22 23 21 22 23 24 25 26 27 28 25 19 20 21 22 23 24 25 +17 24 25 26 27 28 29 30 22 29 30 31 26 26 27 28 29 30 + + July August September + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +26 1 2 31 1 2 3 4 5 6 35 1 2 3 +27 3 4 5 6 7 8 9 32 7 8 9 10 11 12 13 36 4 5 6 7 8 9 10 +28 10 11 12 13 14 15 16 33 14 15 16 17 18 19 20 37 11 12 13 14 15 16 17 +29 17 18 19 20 21 22 23 34 21 22 23 24 25 26 27 38 18 19 20 21 22 23 24 +30 24 25 26 27 28 29 30 35 28 29 30 31 39 25 26 27 28 29 30 +31 31 + October November December + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +39 1 44 1 2 3 4 5 48 1 2 3 +40 2 3 4 5 6 7 8 45 6 7 8 9 10 11 12 49 4 5 6 7 8 9 10 +41 9 10 11 12 13 14 15 46 13 14 15 16 17 18 19 50 11 12 13 14 15 16 17 +42 16 17 18 19 20 21 22 47 20 21 22 23 24 25 26 51 18 19 20 21 22 23 24 +43 23 24 25 26 27 28 29 48 27 28 29 30 52 25 26 27 28 29 30 31 +44 30 31 + diff --git a/tests/expected/cal/year-ys b/tests/expected/cal/year-ys new file mode 100644 index 0000000000..3505e80c7e --- /dev/null +++ b/tests/expected/cal/year-ys @@ -0,0 +1,36 @@ +Gregorian - Sunday-based week + 2006 + + 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 6 7 1 2 3 4 1 2 3 4 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 5 6 7 8 9 10 11 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 12 13 14 15 16 17 18 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 19 20 21 22 23 24 25 +29 30 31 26 27 28 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 1 2 3 4 5 6 1 2 3 + 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 +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 1 2 3 4 5 1 2 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 3 4 5 6 7 8 9 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +23 24 25 26 27 28 29 27 28 29 30 31 24 25 26 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 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/tests/expected/cal/year-ysj b/tests/expected/cal/year-ysj new file mode 100644 index 0000000000..e3f13f9b88 --- /dev/null +++ b/tests/expected/cal/year-ysj @@ -0,0 +1,52 @@ +Julian - Sunday-based week + 2006 + + January February +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 2 3 4 5 6 7 32 33 34 35 + 8 9 10 11 12 13 14 36 37 38 39 40 41 42 + 15 16 17 18 19 20 21 43 44 45 46 47 48 49 + 22 23 24 25 26 27 28 50 51 52 53 54 55 56 + 29 30 31 57 58 59 + + March April +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 60 61 62 63 91 + 64 65 66 67 68 69 70 92 93 94 95 96 97 98 + 71 72 73 74 75 76 77 99 100 101 102 103 104 105 + 78 79 80 81 82 83 84 106 107 108 109 110 111 112 + 85 86 87 88 89 90 113 114 115 116 117 118 119 + 120 + May June +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 121 122 123 124 125 126 152 153 154 +127 128 129 130 131 132 133 155 156 157 158 159 160 161 +134 135 136 137 138 139 140 162 163 164 165 166 167 168 +141 142 143 144 145 146 147 169 170 171 172 173 174 175 +148 149 150 151 176 177 178 179 180 181 + + July August +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 182 213 214 215 216 217 +183 184 185 186 187 188 189 218 219 220 221 222 223 224 +190 191 192 193 194 195 196 225 226 227 228 229 230 231 +197 198 199 200 201 202 203 232 233 234 235 236 237 238 +204 205 206 207 208 209 210 239 240 241 242 243 +211 212 + September October +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 244 245 274 275 276 277 278 279 280 +246 247 248 249 250 251 252 281 282 283 284 285 286 287 +253 254 255 256 257 258 259 288 289 290 291 292 293 294 +260 261 262 263 264 265 266 295 296 297 298 299 300 301 +267 268 269 270 271 272 273 302 303 304 + + November December +Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 305 306 307 308 335 336 +309 310 311 312 313 314 315 337 338 339 340 341 342 343 +316 317 318 319 320 321 322 344 345 346 347 348 349 350 +323 324 325 326 327 328 329 351 352 353 354 355 356 357 +330 331 332 333 334 358 359 360 361 362 363 364 + 365 + diff --git a/tests/expected/cal/year-ysjw b/tests/expected/cal/year-ysjw new file mode 100644 index 0000000000..882453af8d --- /dev/null +++ b/tests/expected/cal/year-ysjw @@ -0,0 +1,52 @@ +Julian - Sunday-based week with week numbers + 2006 + + January February + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 1 1 2 3 4 5 6 7 5 32 33 34 35 + 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 + 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 + 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 + 5 29 30 31 9 57 58 59 + + March April + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat + 9 60 61 62 63 13 91 +10 64 65 66 67 68 69 70 14 92 93 94 95 96 97 98 +11 71 72 73 74 75 76 77 15 99 100 101 102 103 104 105 +12 78 79 80 81 82 83 84 16 106 107 108 109 110 111 112 +13 85 86 87 88 89 90 17 113 114 115 116 117 118 119 + 18 120 + May June + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +18 121 122 123 124 125 126 22 152 153 154 +19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 +20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 +21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 +22 148 149 150 151 26 176 177 178 179 180 181 + + July August + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +26 182 31 213 214 215 216 217 +27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 +28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 +29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 +30 204 205 206 207 208 209 210 35 239 240 241 242 243 +31 211 212 + September October + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +35 244 245 40 274 275 276 277 278 279 280 +36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 +37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 +38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 +39 267 268 269 270 271 272 273 44 302 303 304 + + November December + Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat +44 305 306 307 308 48 335 336 +45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 +46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 +47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 +48 330 331 332 333 334 52 358 359 360 361 362 363 364 + 53 365 + diff --git a/tests/expected/cal/year-ysw b/tests/expected/cal/year-ysw new file mode 100644 index 0000000000..ea2cc6581c --- /dev/null +++ b/tests/expected/cal/year-ysw @@ -0,0 +1,36 @@ +Gregorian - Sunday-based week with week numbers + 2006 + + 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 6 7 5 1 2 3 4 9 1 2 3 4 + 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 + 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 + 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 + 5 29 30 31 9 26 27 28 13 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 +13 1 18 1 2 3 4 5 6 22 1 2 3 +14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 +15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 +16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 +17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 +18 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 +26 1 31 1 2 3 4 5 35 1 2 +27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 +28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 +29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 +30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 +31 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 +40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 +41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 +42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 +43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 +44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 + 53 31 + diff --git a/tests/expected/cal/yearw b/tests/expected/cal/yearw deleted file mode 100644 index 93debbcf90..0000000000 --- a/tests/expected/cal/yearw +++ /dev/null @@ -1,177 +0,0 @@ - -Gregorian - Monday-based week with week numbers - 2006 - - January February March - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -52 1 5 1 2 3 4 5 9 1 2 3 4 5 - 1 2 3 4 5 6 7 8 6 6 7 8 9 10 11 12 10 6 7 8 9 10 11 12 - 2 9 10 11 12 13 14 15 7 13 14 15 16 17 18 19 11 13 14 15 16 17 18 19 - 3 16 17 18 19 20 21 22 8 20 21 22 23 24 25 26 12 20 21 22 23 24 25 26 - 4 23 24 25 26 27 28 29 9 27 28 13 27 28 29 30 31 - 5 30 31 - April May June - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -13 1 2 18 1 2 3 4 5 6 7 22 1 2 3 4 -14 3 4 5 6 7 8 9 19 8 9 10 11 12 13 14 23 5 6 7 8 9 10 11 -15 10 11 12 13 14 15 16 20 15 16 17 18 19 20 21 24 12 13 14 15 16 17 18 -16 17 18 19 20 21 22 23 21 22 23 24 25 26 27 28 25 19 20 21 22 23 24 25 -17 24 25 26 27 28 29 30 22 29 30 31 26 26 27 28 29 30 - - July August September - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -26 1 2 31 1 2 3 4 5 6 35 1 2 3 -27 3 4 5 6 7 8 9 32 7 8 9 10 11 12 13 36 4 5 6 7 8 9 10 -28 10 11 12 13 14 15 16 33 14 15 16 17 18 19 20 37 11 12 13 14 15 16 17 -29 17 18 19 20 21 22 23 34 21 22 23 24 25 26 27 38 18 19 20 21 22 23 24 -30 24 25 26 27 28 29 30 35 28 29 30 31 39 25 26 27 28 29 30 -31 31 - October November December - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -39 1 44 1 2 3 4 5 48 1 2 3 -40 2 3 4 5 6 7 8 45 6 7 8 9 10 11 12 49 4 5 6 7 8 9 10 -41 9 10 11 12 13 14 15 46 13 14 15 16 17 18 19 50 11 12 13 14 15 16 17 -42 16 17 18 19 20 21 22 47 20 21 22 23 24 25 26 51 18 19 20 21 22 23 24 -43 23 24 25 26 27 28 29 48 27 28 29 30 52 25 26 27 28 29 30 31 -44 30 31 - -Gregorian - Sunday-based week with week numbers - 2006 - - 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 6 7 5 1 2 3 4 9 1 2 3 4 - 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 10 5 6 7 8 9 10 11 - 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 11 12 13 14 15 16 17 18 - 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 12 19 20 21 22 23 24 25 - 5 29 30 31 9 26 27 28 13 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 -13 1 18 1 2 3 4 5 6 22 1 2 3 -14 2 3 4 5 6 7 8 19 7 8 9 10 11 12 13 23 4 5 6 7 8 9 10 -15 9 10 11 12 13 14 15 20 14 15 16 17 18 19 20 24 11 12 13 14 15 16 17 -16 16 17 18 19 20 21 22 21 21 22 23 24 25 26 27 25 18 19 20 21 22 23 24 -17 23 24 25 26 27 28 29 22 28 29 30 31 26 25 26 27 28 29 30 -18 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 -26 1 31 1 2 3 4 5 35 1 2 -27 2 3 4 5 6 7 8 32 6 7 8 9 10 11 12 36 3 4 5 6 7 8 9 -28 9 10 11 12 13 14 15 33 13 14 15 16 17 18 19 37 10 11 12 13 14 15 16 -29 16 17 18 19 20 21 22 34 20 21 22 23 24 25 26 38 17 18 19 20 21 22 23 -30 23 24 25 26 27 28 29 35 27 28 29 30 31 39 24 25 26 27 28 29 30 -31 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 -40 1 2 3 4 5 6 7 44 1 2 3 4 48 1 2 -41 8 9 10 11 12 13 14 45 5 6 7 8 9 10 11 49 3 4 5 6 7 8 9 -42 15 16 17 18 19 20 21 46 12 13 14 15 16 17 18 50 10 11 12 13 14 15 16 -43 22 23 24 25 26 27 28 47 19 20 21 22 23 24 25 51 17 18 19 20 21 22 23 -44 29 30 31 48 26 27 28 29 30 52 24 25 26 27 28 29 30 - 53 31 - -Julian - Monday-based week with week numbers - 2006 - - January February - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -52 1 5 32 33 34 35 36 - 1 2 3 4 5 6 7 8 6 37 38 39 40 41 42 43 - 2 9 10 11 12 13 14 15 7 44 45 46 47 48 49 50 - 3 16 17 18 19 20 21 22 8 51 52 53 54 55 56 57 - 4 23 24 25 26 27 28 29 9 58 59 - 5 30 31 - March April - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun - 9 60 61 62 63 64 13 91 92 -10 65 66 67 68 69 70 71 14 93 94 95 96 97 98 99 -11 72 73 74 75 76 77 78 15 100 101 102 103 104 105 106 -12 79 80 81 82 83 84 85 16 107 108 109 110 111 112 113 -13 86 87 88 89 90 17 114 115 116 117 118 119 120 - - May June - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -18 121 122 123 124 125 126 127 22 152 153 154 155 -19 128 129 130 131 132 133 134 23 156 157 158 159 160 161 162 -20 135 136 137 138 139 140 141 24 163 164 165 166 167 168 169 -21 142 143 144 145 146 147 148 25 170 171 172 173 174 175 176 -22 149 150 151 26 177 178 179 180 181 - - July August - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -26 182 183 31 213 214 215 216 217 218 -27 184 185 186 187 188 189 190 32 219 220 221 222 223 224 225 -28 191 192 193 194 195 196 197 33 226 227 228 229 230 231 232 -29 198 199 200 201 202 203 204 34 233 234 235 236 237 238 239 -30 205 206 207 208 209 210 211 35 240 241 242 243 -31 212 - September October - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -35 244 245 246 39 274 -36 247 248 249 250 251 252 253 40 275 276 277 278 279 280 281 -37 254 255 256 257 258 259 260 41 282 283 284 285 286 287 288 -38 261 262 263 264 265 266 267 42 289 290 291 292 293 294 295 -39 268 269 270 271 272 273 43 296 297 298 299 300 301 302 - 44 303 304 - November December - Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun -44 305 306 307 308 309 48 335 336 337 -45 310 311 312 313 314 315 316 49 338 339 340 341 342 343 344 -46 317 318 319 320 321 322 323 50 345 346 347 348 349 350 351 -47 324 325 326 327 328 329 330 51 352 353 354 355 356 357 358 -48 331 332 333 334 52 359 360 361 362 363 364 365 - - -Julian - Sunday-based week with week numbers - 2006 - - January February - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 1 1 2 3 4 5 6 7 5 32 33 34 35 - 2 8 9 10 11 12 13 14 6 36 37 38 39 40 41 42 - 3 15 16 17 18 19 20 21 7 43 44 45 46 47 48 49 - 4 22 23 24 25 26 27 28 8 50 51 52 53 54 55 56 - 5 29 30 31 9 57 58 59 - - March April - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat - 9 60 61 62 63 13 91 -10 64 65 66 67 68 69 70 14 92 93 94 95 96 97 98 -11 71 72 73 74 75 76 77 15 99 100 101 102 103 104 105 -12 78 79 80 81 82 83 84 16 106 107 108 109 110 111 112 -13 85 86 87 88 89 90 17 113 114 115 116 117 118 119 - 18 120 - May June - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -18 121 122 123 124 125 126 22 152 153 154 -19 127 128 129 130 131 132 133 23 155 156 157 158 159 160 161 -20 134 135 136 137 138 139 140 24 162 163 164 165 166 167 168 -21 141 142 143 144 145 146 147 25 169 170 171 172 173 174 175 -22 148 149 150 151 26 176 177 178 179 180 181 - - July August - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -26 182 31 213 214 215 216 217 -27 183 184 185 186 187 188 189 32 218 219 220 221 222 223 224 -28 190 191 192 193 194 195 196 33 225 226 227 228 229 230 231 -29 197 198 199 200 201 202 203 34 232 233 234 235 236 237 238 -30 204 205 206 207 208 209 210 35 239 240 241 242 243 -31 211 212 - September October - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -35 244 245 40 274 275 276 277 278 279 280 -36 246 247 248 249 250 251 252 41 281 282 283 284 285 286 287 -37 253 254 255 256 257 258 259 42 288 289 290 291 292 293 294 -38 260 261 262 263 264 265 266 43 295 296 297 298 299 300 301 -39 267 268 269 270 271 272 273 44 302 303 304 - - November December - Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat -44 305 306 307 308 48 335 336 -45 309 310 311 312 313 314 315 49 337 338 339 340 341 342 343 -46 316 317 318 319 320 321 322 50 344 345 346 347 348 349 350 -47 323 324 325 326 327 328 329 51 351 352 353 354 355 356 357 -48 330 331 332 333 334 52 358 359 360 361 362 363 364 - 53 365 - diff --git a/tests/ts/cal/year b/tests/ts/cal/year index 77e847e28d..6a8c42eaa9 100755 --- a/tests/ts/cal/year +++ b/tests/ts/cal/year @@ -1,7 +1,7 @@ #!/bin/bash # -# Copyright (C) 2007 Karel Zak +# Copyright (C) 2007-2018 Karel Zak # # This file is part of util-linux. # @@ -28,33 +28,27 @@ export TERM=linux USETERM=$( ts_has_option "useterm" "$*" ) MYTIME="29 11 2006" -[ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" - -ts_log "Gregorian - Monday-based week" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ym $MYTIME -fi -$TS_CMD_CAL -ym $MYTIME >> $TS_OUTPUT - -ts_log "Gregorian - Sunday-based week" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ys $MYTIME -fi -$TS_CMD_CAL -ys $MYTIME >> $TS_OUTPUT - - -ts_log "Julian - Monday-based week" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ymj $MYTIME -fi -$TS_CMD_CAL -ymj $MYTIME >> $TS_OUTPUT - -ts_log "Julian - Sunday-based week" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ysj $MYTIME -fi -$TS_CMD_CAL -ysj $MYTIME >> $TS_OUTPUT +function call_cal { + local testname=$(echo "$2" | sed 's/-//g') + + ts_init_subtest "$testname" + ts_log "$1" + shift + if [ "$USETERM" == "yes" ]; then + $TS_CMD_CAL "$@" + fi + $TS_CMD_CAL "$@" >> $TS_OUTPUT + ts_finalize_subtest +} + +call_cal "Gregorian - Monday-based week" -ym $MYTIME +call_cal "Gregorian - Sunday-based week" -ys $MYTIME +call_cal "Julian - Monday-based week" -ymj $MYTIME +call_cal "Julian - Sunday-based week" -ysj $MYTIME +call_cal "Gregorian - Monday-based week with week numbers" -ymw $MYTIME +call_cal "Gregorian - Sunday-based week with week numbers" -ysw $MYTIME +call_cal "Julian - Monday-based week with week numbers" -ymjw $MYTIME +call_cal "Julian - Sunday-based week with week numbers" -ysjw $MYTIME ts_finalize diff --git a/tests/ts/cal/yearw b/tests/ts/cal/yearw deleted file mode 100755 index 2f5d2c40c2..0000000000 --- a/tests/ts/cal/yearw +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# -# Copyright (C) 2007 Karel Zak -# -# This file is part of util-linux. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -TS_TOPDIR="${0%/*}/../.." -TS_DESC="year with week numbers" - -. $TS_TOPDIR/functions.sh -ts_init "$*" - -ts_check_test_command "$TS_CMD_CAL" - -export TERM=linux - -USETERM=$( ts_has_option "useterm" "$*" ) -MYTIME="29 11 2006" - -[ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" - -ts_log "Gregorian - Monday-based week with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ymw $MYTIME -fi -$TS_CMD_CAL -ymw $MYTIME >> $TS_OUTPUT - -ts_log "Gregorian - Sunday-based week with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ysw $MYTIME -fi -$TS_CMD_CAL -ysw $MYTIME >> $TS_OUTPUT - - -ts_log "Julian - Monday-based week with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ymjw $MYTIME -fi -$TS_CMD_CAL -ymjw $MYTIME >> $TS_OUTPUT - -ts_log "Julian - Sunday-based week with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -ysjw $MYTIME -fi -$TS_CMD_CAL -ysjw $MYTIME >> $TS_OUTPUT - -ts_finalize -