From e3970ce152d8adf7ed19fdaa92359f0d13edeaec Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Dec 2012 17:50:00 +0000 Subject: [PATCH] added detection of Marc 2012 in postResults (lib/damask/solver/marc.py) added test for Marc 2012 and updated old tests from 2010 to 2012 --- lib/damask/solver/marc.py | 1 + lib/damask/test/test.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index 1c395cdba..428445a8d 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -10,6 +10,7 @@ class Marc(Solver): #-------------------------- self.solver = 'Marc' self.releases = { \ + '2012': ['linux64',''], '2011': ['linux64',''], '2010.2':['linux64',''], '2010': ['linux64',''], diff --git a/lib/damask/test/test.py b/lib/damask/test/test.py index 91dd6d4fb..6cd5459e5 100644 --- a/lib/damask/test/test.py +++ b/lib/damask/test/test.py @@ -333,7 +333,7 @@ class Test(): if headingsCur == '': headingsCur = headingsRef refName = self.fileInReference(ref) curName = self.fileInCurrent(cur) - return self.compare_Table(headingsRef,refName,headingsCur,curName,normHeadings,normType,absoluteTolerance,perLine,skipLine) + return self.compare_Table(headingsRef,refName,headingsCur,curName,normHeadings,normType,absoluteTolerance,perLine,skipLines) def report_Success(self,culprit):