# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1346071803 -7200
# Node ID 89ed4e8c45c4f1edbae800557dc010729ef5fd9a
# Parent  e952911afd2f9d7d670a81cd7c5cab355124e4b1
Update SPECjvm2008 bench regex

diff -r e952911afd2f -r 89ed4e8c45c4 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Thu Aug 23 15:43:40 2012 +0200
+++ b/mx/sanitycheck.py	Mon Aug 27 14:50:03 2012 +0200
@@ -115,10 +115,10 @@
     if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')):
         mx.abort('Please set the SPECJVM2008 environment variable to a SPECjvm2008 directory')
     
-    score = re.compile(r"^(Score on|Noncompliant) (?P<benchmark>[a-zA-Z0-9\._]+)( result)?: (?P<score>[0-9]+(,|\.)[0-9]+)( SPECjvm2008 Base)? ops/m$")
+    score = re.compile(r"^(Score on|Noncompliant) (?P<benchmark>[a-zA-Z0-9\._]+)( result)?: (?P<score>[0-9]+((,|\.)[0-9]+)?)( SPECjvm2008 Base)? ops/m$")
     error = re.compile(r"^Errors in benchmark: ")
     # The ' ops/m' at the end of the success string is important : it's how you can tell valid and invalid runs apart
-    success = re.compile(r"^(Noncompliant c|C)omposite result: [0-9]+(,|\.)[0-9]+( SPECjvm2008 (Base|Peak))? ops/m$")
+    success = re.compile(r"^(Noncompliant c|C)omposite result: [0-9]+((,|\.)[0-9]+)?( SPECjvm2008 (Base|Peak))? ops/m$")
     matcher = Matcher(score, {'const:group' : "const:SPECjvm2008", 'const:name' : 'benchmark', 'const:score' : 'score'}, startNewLine=True)
     
     opts = []