Removed unused fail label.

Also, moved new tests to end of file.  Update to commit b7416e7959.

diff --git a/sbr/datetime.c b/sbr/datetime.c
index 295522632feacea11fed34b24351b4b78965d0f2..cdcb8991c73637e7740fffcf29de2cbc084adb7c 100644 (file)
--- a/sbr/datetime.c
+++ b/sbr/datetime.c
@@ -332,10 +332,9 @@ rrule_clock (const char *rrule, const char *starttime, const char *zone,
         }
     }
 
-fail:
     if (clock == 0) {
         inform("Unsupported RRULE format: %s, assume local timezone, continuing...",
-           rrule);
+               rrule);
     }
 
     return clock;

diff --git a/test/mhical/test-mhical b/test/mhical/test-mhical
index d017a5407e2be63c95667bd9686db695b5b14189..768135203f4a99642beefd4a38e3081ff009a7e4 100755 (executable)
--- a/test/mhical/test-mhical
+++ b/test/mhical/test-mhical
@@ -30,92 +30,6 @@ actual="$MH_TEST_DIR/test-mhical$$.actual"
 actual_err="$MH_TEST_DIR/test-mhical$$.actual_err"
 
 
-# check timezone boundary at transition from daylight saving time, -2SU
-start_test "timezone boundary at transition from daylight saving time, -2SU"
-# Specifically looking at "second last Sunday of the month" type transitions.
-cat >"$expected" <<'EOF'
-Summary: BST to GMT
-At: Sat, 22 Oct 1994 23:33 +0000
-To: Sun, 23 Oct 1994 07:34
-EOF
-
-cat >"$MH_TEST_DIR/test1.ics" <<'EOF'
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:test-mhical
-BEGIN:VTIMEZONE
-TZID:London
-BEGIN:STANDARD
-TZNAME:GMT
-DTSTART:19931018T020000
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-RRULE:FREQ=YEARLY;BYDAY=-2SU;BYMONTH=10
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:BST
-DTSTART:19810329T010000
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19941002T115852Z
-DTSTART;TZID=London:19941022T233300
-DTEND;TZID=London:19941023T073400
-Summary: BST to GMT
-END:VEVENT
-END:VCALENDAR
-EOF
-
-TZ=GMT mhical <"$MH_TEST_DIR/test1.ics" >"$MH_TEST_DIR/test1.txt"
-check "$expected" "$MH_TEST_DIR/test1.txt"
-
-
-# check timezone boundary at transition to daylight saving time, -1SU
-start_test "timezone boundary at transition to daylight saving time, -1SU"
-# Specifically looking at "last Sunday of the month" type transitions.
-cat >"$expected" <<'EOF'
-Summary: GMT to BST
-At: Sat, 27 Mar 1982 23:31 +0000
-To: Sun, 28 Mar 1982 07:32
-EOF
-
-cat >"$MH_TEST_DIR/test1.ics" <<'EOF'
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:test-mhical
-BEGIN:VTIMEZONE
-TZID:London
-BEGIN:STANDARD
-TZNAME:GMT
-DTSTART:19781025T030000
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-RRULE:FREQ=YEARLY;UNTIL=19811025T010000Z;BYDAY=-1SU;BYMONTH=10
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:BST
-DTSTART:19810329T010000
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19820302T115852Z
-DTSTART;TZID=London:19820327T233100
-DTEND;TZID=London:19820328T073200
-Summary: GMT to BST
-END:VEVENT
-END:VCALENDAR
-EOF
-
-TZ=GMT mhical <"$MH_TEST_DIR/test1.ics" >"$MH_TEST_DIR/test1.txt"
-check "$expected" "$MH_TEST_DIR/test1.txt"
-
-
 # check -help
 start_test "-help"
 cat >"$expected" <<EOF
@@ -1069,5 +983,93 @@ start_test "null input"
 check_exit '-eq 0' mhical </dev/null
 
 
+# check timezone boundary at transition from daylight saving time, -2SU
+start_test "timezone boundary at transition from daylight saving time, -2SU"
+# Specifically looking at "second last Sunday of the month" type transitions.
+cat >"$expected" <<'EOF'
+Summary: BST to GMT
+At: Sat, 22 Oct 1994 23:33 +0000
+To: Sun, 23 Oct 1994 07:34
+EOF
+
+cat >"$MH_TEST_DIR/test1.ics" <<'EOF'
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:test-mhical
+BEGIN:VTIMEZONE
+TZID:London
+BEGIN:STANDARD
+TZNAME:GMT
+DTSTART:19931018T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+RRULE:FREQ=YEARLY;BYDAY=-2SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+DTSTART:19810329T010000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:19941002T115852Z
+DTSTART;TZID=London:19941022T233300
+DTEND;TZID=London:19941023T073400
+Summary: BST to GMT
+END:VEVENT
+END:VCALENDAR
+EOF
+
+TZ=GMT mhical <"$MH_TEST_DIR/test1.ics" >"$MH_TEST_DIR/test1.txt"
+check "$expected" "$MH_TEST_DIR/test1.txt"
+rm -f "$MH_TEST_DIR/test1.ics"
+
+
+# check timezone boundary at transition to daylight saving time, -1SU
+start_test "timezone boundary at transition to daylight saving time, -1SU"
+# Specifically looking at "last Sunday of the month" type transitions.
+cat >"$expected" <<'EOF'
+Summary: GMT to BST
+At: Sat, 27 Mar 1982 23:31 +0000
+To: Sun, 28 Mar 1982 07:32
+EOF
+
+cat >"$MH_TEST_DIR/test1.ics" <<'EOF'
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:test-mhical
+BEGIN:VTIMEZONE
+TZID:London
+BEGIN:STANDARD
+TZNAME:GMT
+DTSTART:19781025T030000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0000
+RRULE:FREQ=YEARLY;UNTIL=19811025T010000Z;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+TZNAME:BST
+DTSTART:19810329T010000
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0100
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:19820302T115852Z
+DTSTART;TZID=London:19820327T233100
+DTEND;TZID=London:19820328T073200
+Summary: GMT to BST
+END:VEVENT
+END:VCALENDAR
+EOF
+
+TZ=GMT mhical <"$MH_TEST_DIR/test1.ics" >"$MH_TEST_DIR/test1.txt"
+check "$expected" "$MH_TEST_DIR/test1.txt"
+rm -f "$MH_TEST_DIR/test1.ics"
+
+
 finish_test
 exit $failed