From 25c9c65dcce869ac8b94e33cb4ade7d999c159de Mon Sep 17 00:00:00 2001 From: bigchimp Date: Sat, 19 Jul 2014 15:34:08 +0000 Subject: [PATCH] fpspreadsheet: FPC trunk on Linux x64 also needs error margins (so FPC 2.6.x on Linux x64 is the only one tested that does not need it). git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3341 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/tests/datetests.pas | 3 ++- components/fpspreadsheet/tests/formulatests.pas | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/fpspreadsheet/tests/datetests.pas b/components/fpspreadsheet/tests/datetests.pas index 9a9becc7f..93da57b2a 100644 --- a/components/fpspreadsheet/tests/datetests.pas +++ b/components/fpspreadsheet/tests/datetests.pas @@ -406,7 +406,8 @@ begin if not(TestWorkSheet.ReadAsDateTime(Row, 0, ActualDateTime)) then Fail('Could not read date time value for cell '+CellNotation(TestWorkSheet,Row)); - {$ifdef mswindows} + {$if (defined(mswindows)) or (FPC_FULLVERSION>=20701)} + // FPC 2.6.x and trunk on Windows need this, also FPC trunk on Linux x64 CheckEquals(SollDates[Row],ActualDateTime,ErrorMargin,'Test date/time value mismatch, ' +'cell '+CellNotation(TestWorksheet,Row)); {$else} diff --git a/components/fpspreadsheet/tests/formulatests.pas b/components/fpspreadsheet/tests/formulatests.pas index 534a5d4bf..6404351c1 100644 --- a/components/fpspreadsheet/tests/formulatests.pas +++ b/components/fpspreadsheet/tests/formulatests.pas @@ -214,7 +214,8 @@ begin 'Test read calculated formula result mismatch, formula "' + formula + '", cell '+CellNotation(MyWorkSheet,Row,1)); atNumber: - {$ifdef mswindows} + {$if (defined(mswindows)) or (FPC_FULLVERSION>=20701)} + // FPC 2.6.x and trunk on Windows need this, also FPC trunk on Linux x64 CheckEquals(expected.NumberValue, actual.NumberValue, ErrorMargin, 'Test read calculated formula result mismatch, formula "' + formula + '", cell '+CellNotation(MyWorkSheet,Row,1));