felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 23:08:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update tests to handle OMIT ... THROUGH ...

Browse Source
This commit is contained in:
David F. Skoll
2010-08-31 13:44:57 -04:00
parent 329d13e480
commit 1d13d0ee07
5 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
man/remind.1
View File

@@ -1376,7 +1376,7 @@ You can debug your global OMITs with the following command:
OMIT DUMP OMIT DUMP
.fi .fi
.PP .PP
The OMIT DUMP command prints the current global omits to standard error. The OMIT DUMP command prints the current global omits to standard output.
.PP .PP
.B THE BEFORE, AFTER AND SKIP KEYWORDS .B THE BEFORE, AFTER AND SKIP KEYWORDS
.PP .PP

12
src/omit.c
View File

@@ -471,24 +471,24 @@ DumpOmits(void)
{ {
int i; int i;
int y, m, d; int y, m, d;
fprintf(stderr, "Global Full OMITs (%d of maximum allowed %d):\n", NumFullOmits, MAX_FULL_OMITS); printf("Global Full OMITs (%d of maximum allowed %d):\n", NumFullOmits, MAX_FULL_OMITS);
if (!NumFullOmits) { if (!NumFullOmits) {
fprintf(stderr, "\tNone.\n"); printf("\tNone.\n");
} else { } else {
for (i=0; i<NumFullOmits; i++) { for (i=0; i<NumFullOmits; i++) {
FromJulian(FullOmitArray[i], &y, &m, &d); FromJulian(FullOmitArray[i], &y, &m, &d);
fprintf(stderr, "\t%04d%c%02d%c%02d\n", printf("\t%04d%c%02d%c%02d\n",
y, DateSep, m+1, DateSep, d); y, DateSep, m+1, DateSep, d);
} }
} }
fprintf(stderr, "Global Partial OMITs (%d of maximum allowed %d):\n", NumPartialOmits, MAX_PARTIAL_OMITS); printf("Global Partial OMITs (%d of maximum allowed %d):\n", NumPartialOmits, MAX_PARTIAL_OMITS);
if (!NumPartialOmits) { if (!NumPartialOmits) {
fprintf(stderr, "\tNone.\n"); printf("\tNone.\n");
} else { } else {
for (i=0; i<NumPartialOmits; i++) { for (i=0; i<NumPartialOmits; i++) {
m = PartialOmitArray[i] >> 5 & 0xf; m = PartialOmitArray[i] >> 5 & 0xf;
d = PartialOmitArray[i] & 0x1f; d = PartialOmitArray[i] & 0x1f;
fprintf(stderr, "\t%02d%c%02d\n", m+1, DateSep, d); printf("\t%02d%c%02d\n", m+1, DateSep, d);
} }
} }
} }

16
tests/test-rem
View File

@@ -22,28 +22,28 @@ chmod 000 include_dir/04cantread.rem
TEST_GETENV="foo bar baz" ; export TEST_GETENV TEST_GETENV="foo bar baz" ; export TEST_GETENV
echo "Test 1" > ../tests/test.out echo "Test 1" > ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -e -dxte ../tests/test.rem 16 feb 1991 >> ../tests/test.out ../src/remind -e -dxte ../tests/test.rem 16 feb 1991 >> ../tests/test.out 2>&1
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
echo "Test 2" >> ../tests/test.out echo "Test 2" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -p -l ../tests/test2.rem 1 aug 2007 >> ../tests/test.out ../src/remind -p -l ../tests/test2.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
echo "Test 3" >> ../tests/test.out echo "Test 3" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -s ../tests/test2.rem 1 aug 2007 >> ../tests/test.out ../src/remind -s ../tests/test2.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
echo "Test 4" >> ../tests/test.out echo "Test 4" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -sa ../tests/test2.rem 1 aug 2007 >> ../tests/test.out ../src/remind -sa ../tests/test2.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "Test 5" >> ../tests/test.out echo "Test 5" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -p -l -b0 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out ../src/remind -p -l -b0 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "Test 6" >> ../tests/test.out echo "Test 6" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -p -l -b1 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out ../src/remind -p -l -b1 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "Test 7" >> ../tests/test.out echo "Test 7" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
../src/remind -p -l -b2 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out ../src/remind -p -l -b2 ../tests/test3.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "Test 8" >> ../tests/test.out echo "Test 8" >> ../tests/test.out
echo "" >> ../tests/test.out echo "" >> ../tests/test.out
@@ -58,7 +58,7 @@ echo "" >> ../tests/test.out
chmod 644 include_dir/04cantread.rem chmod 644 include_dir/04cantread.rem
echo "Color Test" >> ../tests/test.out echo "Color Test" >> ../tests/test.out
../src/remind -ccl ../tests/colors.rem 1 aug 2007 >> ../tests/test.out ../src/remind -ccl ../tests/colors.rem 1 aug 2007 >> ../tests/test.out 2>&1
echo "MON WKDAY DAY across year test" >> ../tests/test.out echo "MON WKDAY DAY across year test" >> ../tests/test.out
echo 'REM Mon 29 Dec MSG x' | ../src/remind -dt - 1 Jan 2000 >> ../tests/test.out 2>&1 echo 'REM Mon 29 Dec MSG x' | ../src/remind -dt - 1 Jan 2000 >> ../tests/test.out 2>&1

24
tests/test.cmp
View File

@@ -1046,6 +1046,30 @@ dump
a045 "iess" a045 "iess"
a064 1 a064 1
a083 1991-03-24 a083 1991-03-24
OMIT 2010-09-03 THROUGH 2010-09-15
OMIT December 25 MSG X
../tests/test.rem(286): Trig = Wednesday, 25 December, 1991
# Next should give a parse error
OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
../tests/test.rem(288): Unknown token: `MSG' (OMIT)
OMIT DUMP
Global Full OMITs (14 of maximum allowed 500):
1991-03-11
2010-09-03
2010-09-04
2010-09-05
2010-09-06
2010-09-07
2010-09-08
2010-09-09
2010-09-10
2010-09-11
2010-09-12
2010-09-13
2010-09-14
2010-09-15
Global Partial OMITs (1 of maximum allowed 366):
12-25
Test 2 Test 2

5
tests/test.rem
View File

@@ -282,3 +282,8 @@ set a083 slide('1991-04-01', -7, "Sat")
set a084 nonomitted('1991-03-01', '1991-03-13', "Sat", "Sun") set a084 nonomitted('1991-03-01', '1991-03-13', "Sat", "Sun")
set a085 nonomitted('1991-03-24', '1991-04-01', "Sat") set a085 nonomitted('1991-03-24', '1991-04-01', "Sat")
dump dump
OMIT 2010-09-03 THROUGH 2010-09-15
OMIT December 25 MSG X
# Next should give a parse error
OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
OMIT DUMP