From 37375c0464d0912ea7b173a99f9cbbc47bd93de4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 18 Jan 2010 15:37:42 +0000 Subject: s390xport02: #i108410# different results for s390x --- basegfx/test/basegfx2d.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'basegfx/test') diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 1bd15702e143..61c02e8ccdd2 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -490,7 +490,12 @@ public: // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32 // uses more 'S' statements (as it should be for circles) CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", - nCount==67 || nCount==50); +#ifdef S390X + nCount==61 +#else + nCount==67 || nCount==50 +#endif + ); const B2DPolygon aRect( tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) )); -- cgit From 8da5fabbe6d9f1dc6e01290c2800c1ddaa686f85 Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Mon, 1 Feb 2010 13:37:42 +0100 Subject: #i10000# windows build fix, rearranged ifdef --- basegfx/test/basegfx2d.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'basegfx/test') diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 61c02e8ccdd2..b592a0e84ea6 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -489,13 +489,11 @@ public: // depending on float precision and the getContinuity() implemetation using // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32 // uses more 'S' statements (as it should be for circles) - CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", #ifdef S390X - nCount==61 + CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==61 ); #else - nCount==67 || nCount==50 + CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 ); #endif - ); const B2DPolygon aRect( tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) )); -- cgit