Fix tests to cope with altered zdump outputrelease_2014.7

2 files changed, 3 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index ac023e7..a1f46f0 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ test: test_lazy test_tzinfo test_docs test_zdump
 
 clean:
 	rm -f .stamp-*
-	rm -rf build/*/*
+	rm -rf build/*/* zdump.out
 	make -C ${OLSON}/src clean
 	find . -name \*.pyc | xargs rm -f
 
diff --git a/test_zdump.py b/test_zdump.py
index 957423c..0a88788 100644
--- a/test_zdump.py
+++ b/test_zdump.py
@@ -30,7 +30,8 @@ def test_suite():
     last_zone = None
     test_class = None
     zdump_line_re = re.compile(r'''(?x)
-        ^([^\s]+) \s+ (.+) \s UT \s+ = \s+ (.+) \s ([^\s]+) \s+ isdst=(0|1)$
+        ^([^\s]+) \s+ (.+) \s UT \s+ = \s+ (.+) \s ([^\s]+) \s+
+                               isdst=(0|1) \s+ gmtoff=[\-\d]+ \s*$
         ''')
     for i in range(0, len(raw_data)):
         line = raw_data[i]