external/curl/curl-android.patch | 14 +++++++------- sc/qa/unit/opencl-test.cxx | 4 ++-- sc/qa/unit/subsequent_export-test.cxx | 10 +++++----- sc/qa/unit/subsequent_filters-test.cxx | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit 8aa5c802e371e53d16810877210dc3068e11cb9b Author: Caolán McNamara <caol...@redhat.com> Date: Sat Jul 30 19:37:01 2016 +0100 fix curl android patch to apply Change-Id: I554f483ddf7bdc8b0347d7ae4d1fe7bb6aad8336 diff --git a/external/curl/curl-android.patch b/external/curl/curl-android.patch index 40cf124..8a74fb9 100644 --- a/external/curl/curl-android.patch +++ b/external/curl/curl-android.patch @@ -1,16 +1,16 @@ diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh --- curl-7.26.0/ltmain.sh 2012-07-02 14:05:04.256112279 +0200 +++ misc/build/curl-7.26.0/ltmain.sh 2012-07-02 14:07:23.775119842 +0200 -@@ -7307,6 +7307,12 @@ - func_warning "\`-release' is ignored for convenience libraries" +@@ -8784,6 +8784,12 @@ + func_warning "'-release' is ignored for convenience libraries" else -+ # Force no versioning suffix for Android thanks to silly -+ # apkbuilder which doesn't add extra native libs unless their -+ # name ends with .so ++ # Force no versioning suffix for Android thanks to silly ++ # apkbuilder which doesn't add extra native libs unless their ++ # name ends with .so + -+ version_type=none ++ version_type=none + # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 commit b3537a541053ab1c3c20664b4994fffe6ae26e7a Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Jul 30 03:24:20 2016 +0200 loplugin:cppunitassertequals Change-Id: Iaf1874409310f2728a5170e4b08d5a8a81999ded Reviewed-on: https://gerrit.libreoffice.org/27713 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 8b71bb0..64290cd 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -749,10 +749,10 @@ void ScOpenCLTest::testSystematic() CPPUNIT_ASSERT(nBVertBegin != 0); CPPUNIT_ASSERT(nAVertEnd > nAVertBegin + 100); CPPUNIT_ASSERT(nBVertEnd > nBVertBegin + 100); - CPPUNIT_ASSERT((nAVertEnd-nAVertBegin) == (nBVertEnd-nBVertBegin)); + CPPUNIT_ASSERT_EQUAL(nAVertEnd-nAVertBegin, nBVertEnd-nBVertBegin); CPPUNIT_ASSERT(nAHorEnd > 10); CPPUNIT_ASSERT(nBHorEnd > 10); - CPPUNIT_ASSERT(nAHorEnd == nBHorEnd); + CPPUNIT_ASSERT_EQUAL(nAHorEnd, nBHorEnd); for (SCROW i = nAVertBegin; i < nAVertEnd; ++i) { diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index eac7d98..60131bc 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -1924,8 +1924,8 @@ void ScExportTest::testBordersExchangeXLSX() rDoc.GetBorderLines(nCol + 2, (nRow * 2) + 8, 0, nullptr, &pLineTop, nullptr, &pLineBottom); if((nCol < 5) && (nRow == 6)) { // in this range no lines - CPPUNIT_ASSERT(pLineTop == nullptr); - CPPUNIT_ASSERT(pLineBottom == nullptr); + CPPUNIT_ASSERT(!pLineTop); + CPPUNIT_ASSERT(!pLineBottom); continue; } else @@ -3289,7 +3289,7 @@ void ScExportTest::testMoveCellAnchoredShapes() // Check cell anchor state ScAnchorType oldType = ScDrawLayer::GetAnchorType(*pObj); - CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Failed to get anchor type", SCA_CELL, oldType); // Get anchor data ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); @@ -3351,7 +3351,7 @@ void ScExportTest::testMoveCellAnchoredShapes() // Check cell anchor state oldType = ScDrawLayer::GetAnchorType(*pObj); - CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Failed to get anchor type", SCA_CELL, oldType); // Get anchor data pData = ScDrawLayer::GetObjData(pObj); @@ -3412,7 +3412,7 @@ void ScExportTest::testMoveCellAnchoredShapes() // Check cell anchor state oldType = ScDrawLayer::GetAnchorType(*pObj); - CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Failed to get anchor type", SCA_CELL, oldType); // Get anchor data pData = ScDrawLayer::GetObjData(pObj); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 62ce805..cef4fef 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -924,7 +924,7 @@ void ScFiltersTest::testBorderODS() CPPUNIT_ASSERT_EQUAL( table::BorderLineStyle::SOLID, pRight->GetBorderLineStyle()); CPPUNIT_ASSERT_EQUAL(5L, pRight->GetWidth()); - CPPUNIT_ASSERT(pRight->GetColor() == Color(COL_BLUE)); + CPPUNIT_ASSERT_EQUAL(Color(COL_BLUE), pRight->GetColor()); xDocSh->DoClose(); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits