vcl/qa/cppunit/BitmapScaleTest.cxx | 3 +-- vcl/qa/cppunit/graphicfilter/filters-test.cxx | 11 +++++------ vcl/qa/cppunit/timer.cxx | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit b0342fab0d69e9f120c5e4d2942b778b774ec67d Author: shlok3640 <[email protected]> AuthorDate: Tue Feb 10 06:46:38 2026 +0000 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Tue Feb 10 11:55:53 2026 +0100 tdf#130924 Revert SAL_INFO/SAL_WARN changes to vcl/qa This patch partially reverts f69793083e625e7c4533dc7e4240927463f53b58 Reason described by Stephan: "I think for test code (in vcl/qa) we always want to print information about how and why a test failed, regardless of the configuration of --enable-sal-log and the SAL_LOG environment variable. (Otherwise, it just gets harder to decipher why some buildbot build, for which all we have is its stdout/-err output, failed.)" https://gerrit.libreoffice.org/c/core/+/197490/comments/3d04e8a0_9793bd57 Change-Id: I51a36350bd361eb48222513fc39a2b80416c6b8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199017 Reviewed-by: Hossein <[email protected]> Tested-by: Jenkins diff --git a/vcl/qa/cppunit/BitmapScaleTest.cxx b/vcl/qa/cppunit/BitmapScaleTest.cxx index b1e9c4472742..9c696cd51146 100644 --- a/vcl/qa/cppunit/BitmapScaleTest.cxx +++ b/vcl/qa/cppunit/BitmapScaleTest.cxx @@ -10,7 +10,6 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <sal/log.hxx> #include <vcl/bitmap.hxx> #include <tools/stream.hxx> @@ -110,7 +109,7 @@ void BitmapScaleTest::testScale() OString testStr = "Testing scale (" + scaleSize.srcSize.toString() + ")->(" + scaleSize.destSize.toString() + "), method " + OString::number(static_cast<int>(scaleMethod)); - SAL_INFO("vcl", testStr); + fprintf(stderr, "%s ", testStr.getStr()); Bitmap bitmap(scaleSize.srcSize, vcl::PixelFormat::N24_BPP); { // Fill each quarter of the source bitmap with a different color, diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index b352cdafc001..44d0c7aa01e4 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -8,7 +8,6 @@ */ #include <sal/config.h> -#include <sal/log.hxx> #include <cstdlib> #include <unotest/filters-test.hxx> @@ -138,15 +137,15 @@ void VclFiltersTest::checkExportImport(std::u16string_view aFilterShortName) void VclFiltersTest::testExportImport() { - SAL_INFO("vcl", "Check ExportImport JPG"); + fprintf(stderr, "Check ExportImport JPG "); checkExportImport(u"jpg"); - SAL_INFO("vcl", "Check ExportImport PNG"); + fprintf(stderr, "Check ExportImport PNG "); checkExportImport(u"png"); - SAL_INFO("vcl", "Check ExportImport BMP"); + fprintf(stderr, "Check ExportImport BMP "); checkExportImport(u"bmp"); - SAL_INFO("vcl", "Check ExportImport TIF"); + fprintf(stderr, "Check ExportImport TIF "); checkExportImport(u"tif"); - SAL_INFO("vcl", "Check ExportImport WEBP"); + fprintf(stderr, "Check ExportImport WEBP "); checkExportImport(u"webp"); } diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx index 05c9d8babe64..467d7b1a776d 100644 --- a/vcl/qa/cppunit/timer.cxx +++ b/vcl/qa/cppunit/timer.cxx @@ -43,7 +43,7 @@ public: virtual void SAL_CALL run() override { osl::Thread::wait( std::chrono::seconds(mnSeconds) ); - SAL_WARN("vcl", "WatchDog timer thread expired, failing the test!"); + fprintf(stderr, "ERROR: WatchDog timer thread expired, failing the test! "); fflush(stderr); CPPUNIT_ASSERT_MESSAGE("watchdog triggered", false); }
