[PATCH 1/3] s3: Fix broken make tests on some build servers

[Matthieu Patou]

This fix is a temporary workaround on a brokage that has been introduced
during the migration to python based subunit.

A definitive and more complete fix exists in the the master branch.
---
 selftest/subunithelper.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 5121317..6c121a4 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -44,8 +44,11 @@ def parse_results(msg_ops, statistics, fh):
         elif command == "time":
             msg_ops.control_msg(l)
             grp = re.match(
-                "(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n", arg)
-            msg_ops.report_time(time.mktime((int(grp.group(1)), int(grp.group(2)), int(grp.group(3)), int(grp.group(4)), int(grp.group(5)), int(grp.group(6)), 0, 0, 0)))
+                "(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(\n|\.)", arg)
+            try:
+                msg_ops.report_time(time.mktime((int(grp.group(1)), int(grp.group(2)), int(grp.group(3)), int(grp.group(4)), int(grp.group(5)), int(grp.group(6)), 0, 0, 0)))
+            except:
+                print "Not well formated %s" % arg
         elif command in VALID_RESULTS:
             msg_ops.control_msg(l)
             result = command
-- 
1.7.1


--------------040603020602050103000309
Content-Type: text/x-patch;
 name="0003-s3-build-Finish-to-correct-the-Makefile.in-so-that-i.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0003-s3-build-Finish-to-correct-the-Makefile.in-so-that-i.pa";
 filename*1="tch"