[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2023-01-12 Thread Tor Lillqvist (via logerrit) 
 vcl/Module_vcl.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 743713648e1abc124fc5783f3ea6a20b7d73701d
Author: Tor Lillqvist 
AuthorDate: Wed Jan 11 12:56:04 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Jan 12 08:26:22 2023 +

Don't bother building the vcldemo executable for WASM unless using Qt5

Reduces build time a bit.

Sadly, we do need to build soffice.wasm also when not using Qt5,
because wasm/Makefile.am in online uses its .linkdeps file.

Change-Id: I48f67598050208220e63e3a0ff627f6420ff837f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145353
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 596ed5b8c03a..b6d06a6bc351 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -37,7 +37,9 @@ $(eval $(call gb_Module_add_targets,vcl,\
 $(if $(filter DESKTOP FUZZERS,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
 $(if $(or $(DISABLE_GUI),$(DISABLE_DYNLOADING)), \
-$(if $(filter EMSCRIPTEN,$(OS)),Executable_vcldemo) \
+$(if $(filter EMSCRIPTEN,$(OS)), \
+$(if $(ENABLE_QT5),Executable_vcldemo) \
+) \
 , \
 $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
 Executable_vcldemo \

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2020-07-21 Thread Tor Lillqvist (via logerrit) 
 vcl/Module_vcl.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c3206f7cdec65f3ec4ea6739830933543020e7c2
Author: Tor Lillqvist 
AuthorDate: Tue Jul 21 10:11:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jul 21 11:14:28 2020 +0200

Bypass CppunitTest_vcl_pdfium_library_test unless we have Pdfium

Change-Id: Ic93b2bf66ded948009a9d2d045d98a4bde9ee249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99119
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99123
Tested-by: Jenkins

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a0c3e516b6bb..0e7bb1600b0a 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -207,7 +207,8 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
 CppunitTest_vcl_backend_test \
 CppunitTest_vcl_blocklistparser_test \
 CppunitTest_vcl_type_serializer_test \
-CppunitTest_vcl_pdfium_library_test \
+$(call gb_Helper_optional, PDFIUM, \
+CppunitTest_vcl_pdfium_library_test) \
 ))
 
 ifeq ($(USING_X11),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2020-03-07 Thread Tomaž Vajngerl (via logerrit) 
 vcl/Module_vcl.mk |   82 +++---
 1 file changed, 41 insertions(+), 41 deletions(-)

New commits:
commit 3729ef3347a0399ab3ef672f489de4a9b3d051cf
Author: Tomaž Vajngerl 
AuthorDate: Sat Mar 7 11:01:19 2020 +0100
Commit: Tomaž Vajngerl 
CommitDate: Sat Mar 7 14:41:02 2020 +0100

vcl: Module_vcl.mk - convert tabs to spaces

Change-Id: I1c6975d42936714fc28a636fbc363c7776858522
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90153
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 66ca4f01490b..aaa05759d39d 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,21 +25,21 @@ $(eval $(call gb_Module_add_targets,vcl,\
 Package_theme_definitions \
 Package_tipoftheday \
 UIConfig_vcl \
-   $(if $(filter WNT,$(OS)), \
-   Package_opengl_blacklist ) \
-   $(if $(filter SKIA,$(BUILD_TYPE)), \
-   Package_skia_blacklist ) \
+$(if $(filter WNT,$(OS)), \
+Package_opengl_blacklist ) \
+$(if $(filter SKIA,$(BUILD_TYPE)), \
+Package_skia_blacklist ) \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
-   $(if $(ENABLE_MACOSX_SANDBOX),, \
-   $(if $(DISABLE_GUI),, \
-   Executable_ui-previewer)) \
-   $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
-   $(if $(DISABLE_GUI),, \
-   Executable_vcldemo \
-   Executable_icontest \
-   Executable_visualbackendtest \
-   Executable_mtfdemo ))) \
+$(if $(ENABLE_MACOSX_SANDBOX),, \
+$(if $(DISABLE_GUI),, \
+Executable_ui-previewer)) \
+$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
+$(if $(DISABLE_GUI),, \
+Executable_vcldemo \
+Executable_icontest \
+Executable_visualbackendtest \
+Executable_mtfdemo ))) \
 ))
 
 ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),)
@@ -184,53 +184,53 @@ $(eval $(call gb_Module_add_targets,vcl,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,vcl,\
-   CppunitTest_vcl_lifecycle \
-   CppunitTest_vcl_bitmap_test \
-   CppunitTest_vcl_bitmapprocessor_test \
-   CppunitTest_vcl_graphic_test \
-   CppunitTest_vcl_fontcharmap \
-   CppunitTest_vcl_font \
-   CppunitTest_vcl_fontfeature \
-   CppunitTest_vcl_fontmetric \
-   CppunitTest_vcl_complextext \
-   CppunitTest_vcl_filters_test \
-   CppunitTest_vcl_mnemonic \
-   CppunitTest_vcl_outdev \
-   CppunitTest_vcl_app_test \
-   CppunitTest_vcl_jpeg_read_write_test \
-   CppunitTest_vcl_svm_test \
-   CppunitTest_vcl_errorhandler \
-   CppunitTest_vcl_bitmap_render_test \
-   CppunitTest_vcl_apitests \
-   CppunitTest_vcl_png_test \
-   CppunitTest_vcl_widget_definition_reader_test \
-   CppunitTest_vcl_backend_test \
-   CppunitTest_vcl_blocklistparser_test \
-   CppunitTest_vcl_type_serializer_test \
+CppunitTest_vcl_lifecycle \
+CppunitTest_vcl_bitmap_test \
+CppunitTest_vcl_bitmapprocessor_test \
+CppunitTest_vcl_graphic_test \
+CppunitTest_vcl_fontcharmap \
+CppunitTest_vcl_font \
+CppunitTest_vcl_fontfeature \
+CppunitTest_vcl_fontmetric \
+CppunitTest_vcl_complextext \
+CppunitTest_vcl_filters_test \
+CppunitTest_vcl_mnemonic \
+CppunitTest_vcl_outdev \
+CppunitTest_vcl_app_test \
+CppunitTest_vcl_jpeg_read_write_test \
+CppunitTest_vcl_svm_test \
+CppunitTest_vcl_errorhandler \
+CppunitTest_vcl_bitmap_render_test \
+CppunitTest_vcl_apitests \
+CppunitTest_vcl_png_test \
+CppunitTest_vcl_widget_definition_reader_test \
+CppunitTest_vcl_backend_test \
+CppunitTest_vcl_blocklistparser_test \
+CppunitTest_vcl_type_serializer_test \
 ))
 
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_check_targets,vcl,\
-   CppunitTest_vcl_timer \
+CppunitTest_vcl_timer \
 ))
 endif
 
 ifeq ($(DISABLE_GUI),TRUE)
 $(eval $(call gb_Module_add_check_targets,vcl,\
-   CppunitTest_vcl_timer \
+CppunitTest_vcl_timer \
 ))
 endif
 
 # Is any configuration missing?
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_check_targets,vcl,\
-   CppunitTest_vcl_timer \
+CppunitTest_vcl_timer \
 ))
 endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_check_targets,vcl,\
-   CppunitTest_vcl_timer \
+CppunitTest_vcl_timer \
 ))
 endif
 
@@ -247,7 +247,7 @@ endif
 
 ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_slowcheck_targets,vcl,\
-   CppunitTest_vcl_pdfexport \
+CppunitTest_vcl_pdfexport \
 ))
 endif
 
___
Libreoffice-commits mailing list

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2019-10-30 Thread Luboš Luňák (via logerrit) 
 vcl/Module_vcl.mk |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 282126c22cccac60388df2cbf3216acb3ba33e21
Author: Luboš Luňák 
AuthorDate: Wed Oct 30 12:03:24 2019 +0100
Commit: Luboš Luňák 
CommitDate: Wed Oct 30 12:04:24 2019 +0100

make CppunitTest_vcl_pdfexport a slowcheck

Because it is, well, slow.

Change-Id: I0efb4ee9720736aded938adbb93b12cb227ac2ae

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 859702ca4032..5620f188c7f2 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -206,12 +206,6 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_backend_test \
 ))
 
-ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
-$(eval $(call gb_Module_add_check_targets,vcl,\
-   CppunitTest_vcl_pdfexport \
-))
-endif
-
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_timer \
@@ -249,4 +243,10 @@ $(eval $(call gb_Module_add_slowcheck_targets,vcl,\
 ))
 endif
 
+ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))
+$(eval $(call gb_Module_add_slowcheck_targets,vcl,\
+   CppunitTest_vcl_pdfexport \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2016-12-19 Thread Caolán McNamara 
 vcl/Module_vcl.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 9aa53881393a2f8d6316473682c9c0682b2ce0ff
Author: Caolán McNamara 
Date:   Thu Dec 15 13:59:27 2016 +

drop uninteresting binaries

Change-Id: Ibf8a1ef17448c09195a6e7d5093f738136d91af6
Reviewed-on: https://gerrit.libreoffice.org/32197
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index d7232f9..153b4ac 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -36,6 +36,11 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_icontest \
Executable_visualbackendtest \
Executable_mtfdemo ))) \
+))
+
+ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),)
+
+$(eval $(call gb_Module_add_targets,vcl,\
 $(if $(filter-out ANDROID IOS WNT,$(OS)), \
 Executable_svdemo \
 Executable_fftester \
@@ -43,6 +48,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
 Executable_svpclient) \
 ))
 
+endif
+
 $(eval $(call gb_Module_add_l10n_targets,vcl,\
 AllLangResTarget_vcl \
 UIConfig_vcl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2016-08-30 Thread Stephan Bergmann 
 vcl/Module_vcl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a037f6338c19e16bcbc0674214666a786872c59d
Author: Stephan Bergmann 
Date:   Tue Aug 30 16:20:11 2016 +0200

Disable CppunitTest_vcl_wmf_test under --enable-merglibs for now

...the problems caused by that test having the vcl objects linked into both 
the
test's library and the mergedlib (which the test's library links against) 
are
just not manageable.

Change-Id: I6976407275f1f8d8cebfe2dfc6c09656a3936200

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 19f9f76..b1ef05d 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -107,7 +107,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_mapmode \
CppunitTest_vcl_outdev \
CppunitTest_vcl_app_test \
-   CppunitTest_vcl_wmf_test \
+   $(if $(MERGELIBS),,CppunitTest_vcl_wmf_test) \
 ))
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2016-02-14 Thread Tor Lillqvist 
 vcl/Module_vcl.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f48b789e1b985f65be2c15e508202ccf9ec05102
Author: Tor Lillqvist 
Date:   Mon Feb 15 09:15:42 2016 +0200

Package_opengl_blacklist is Windows-specific

Change-Id: Ida79aa0d5a519a2c124d20a1cd908411d01799de

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 65fa586..6a41a0b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -23,7 +23,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
 CustomTarget_afm_hash \
 Library_vcl \
Package_opengl \
-   Package_opengl_blacklist \
+   $(if $(filter WNT,$(OS)), \
+   Package_opengl_blacklist ) \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
$(if $(ENABLE_HEADLESS),, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2016-01-20 Thread David Tardon 
 vcl/Module_vcl.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e1367aaf7d9cc93bbbe3ba64015fde3469c61c6e
Author: David Tardon 
Date:   Wed Jan 20 23:20:30 2016 +0100

disable test that suddenly eats GBs of memory

Regression since 62ea0ef8428ca4e12c5fa11674737a9bf0b646aa "replace use
of basebmp in vcl entirely now".

Change-Id: I196d02c20c00c938c3e298eb1a0f89029581e704

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 299ffb1..bedb0e7 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_font \
CppunitTest_vcl_fontmetric \
CppunitTest_vcl_complextext \
-   CppunitTest_vcl_filters_test \
CppunitTest_vcl_outdev \
CppunitTest_vcl_app_test \
CppunitTest_vcl_wmf_test \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2015-08-28 Thread Tor Lillqvist 
 vcl/Module_vcl.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 02d87840558523370d552ef452f1660300d161b5
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Aug 28 10:43:46 2015 +0300

Revert CppunitTest_vcl_timer always fails on Windows for me

Now it works for me on Windows.

This reverts commit 6e8ec907dce656b81486889bf27489ad866cebd2.

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 4706bdb..c949f42 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -124,4 +124,10 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
 ))
 endif
 
+# Is any configuration missing?
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_check_targets,vcl,\
+   CppunitTest_vcl_timer \
+))
+endif
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk vcl/qa

2015-08-23 Thread Ashod Nakashian 
 vcl/Module_vcl.mk|7 +++
 vcl/qa/cppunit/timer.cxx |  109 +--
 2 files changed, 112 insertions(+), 4 deletions(-)

New commits:
commit b103e7d786f5b7ec6cfe4f53f2ca317f06ceabc5
Author: Ashod Nakashian ashodnakash...@yahoo.com
Date:   Thu Aug 20 21:06:06 2015 -0400

vcl: unittests for Timer and AutoTimer.

Enabled VCL Timer unittests on Windows builds and added two unittests to
detect misfiring of timer events.

Due to the nature of timer events having virtually no guarantees on
non-realtime operating systems, the tests may fail randomly under
different system loads.  The tests repeat a few times in such cases, but
still there are no guarantees.

These tests are added to detect gross breaks in the timer algorithms and
to improve certain corner cases.  They are designed to minimize any
random failures.

Posterity might hate me for committing such unittests, so I added
TEST_TIMERPRECISION directive to include/exclude the tests at compile
time. It should be enabled if it causes more harm than good.

Change-Id: If2856f194cb4732c84900113bdb969f397f67d5a
Reviewed-on: https://gerrit.libreoffice.org/17906
Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de
Tested-by: Thorsten Behrens thorsten.behr...@cib.de

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index c3e84e6..c949f42 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -123,4 +123,11 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_timer \
 ))
 endif
+
+# Is any configuration missing?
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_check_targets,vcl,\
+   CppunitTest_vcl_timer \
+))
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 88807fc..85dc9ac 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -22,6 +22,8 @@
 #include salinst.hxx
 
 // #define TEST_WATCHDOG
+// Comment if UT fails randomly.
+#define TEST_TIMERPRECISION
 
 /// Avoid our timer tests just wedging the build if they fail.
 class WatchDog : public osl::Thread
@@ -44,7 +46,7 @@ public:
 }
 };
 
-static WatchDog aWatchDog( 10 /* 10 secs should be enough */);
+static WatchDog aWatchDog( 12 /* 12 secs should be enough */);
 
 class TimerTest : public test::BootstrapFixture
 {
@@ -58,6 +60,7 @@ public:
 #endif
 void testDurations();
 void testAutoTimer();
+void testMultiAutoTimers();
 void testRecursiveTimer();
 void testSlowTimerCallback();
 
@@ -69,6 +72,7 @@ public:
 #endif
 CPPUNIT_TEST(testDurations);
 CPPUNIT_TEST(testAutoTimer);
+CPPUNIT_TEST(testMultiAutoTimers);
 CPPUNIT_TEST(testRecursiveTimer);
 CPPUNIT_TEST(testSlowTimerCallback);
 
@@ -117,6 +121,7 @@ void TimerTest::testIdle()
 // tdf#91727
 void TimerTest::testIdleMainloop()
 {
+#ifndef WNT
 bool bTriggered = false;
 IdleBool aTest( bTriggered );
 // coverity[loop_top] - Application::Yield allows the timer to fire and 
toggle bDone
@@ -131,6 +136,7 @@ void TimerTest::testIdleMainloop()
 pSVData-maAppData.mnDispatchLevel--;
 }
 CPPUNIT_ASSERT_MESSAGE(mainloop idle triggered, bTriggered);
+#endif
 }
 
 // 
@@ -189,11 +195,106 @@ public:
 
 void TimerTest::testAutoTimer()
 {
+const sal_Int32 nDurationMs = 30;
+const sal_Int32 nEventsCount = 5;
+const double exp = (nDurationMs * nEventsCount);
+
 sal_Int32 nCount = 0;
-AutoTimerCount aCount(1, nCount);
-while (nCount  100) {
-Application::Yield();
+double dur = 0;
+std::ostringstream msg;
+
+// Repeat when we have random latencies.
+// This is expected on non-realtime OSes.
+for (int i = 0; i  10; ++i)
+{
+const auto start = std::chrono::high_resolution_clock::now();
+nCount = 0;
+AutoTimerCount aCount(nDurationMs, nCount);
+while (nCount  nEventsCount) {
+Application::Yield();
+}
+
+const auto end = std::chrono::high_resolution_clock::now();
+dur = std::chrono::durationdouble, std::milli(end - start).count();
+
+msg  std::setprecision(2)  std::fixed
+ periodic multi-timer - dur: 
+ dur   (  exp  ) ms.  std::endl;
+
+// +/- 20% should be reasonable enough a margin.
+if (dur = (exp * 0.8)  dur = (exp * 1.2))
+{
+// Success.
+return;
+}
+}
+
+#ifdef TEST_TIMERPRECISION
+CPPUNIT_FAIL(msg.str().c_str());
+#endif
+}
+
+void TimerTest::testMultiAutoTimers()
+{
+// The behavior of the timers change drastically
+// when multiple timers are present.
+// The worst, in my tests, is when two
+// timers with 1ms period exist with a
+// third of much longer period.
+
+const sal_Int32 nDurationMsX = 5;
+const sal_Int32 nDurationMsY = 10;
+const sal_Int32

[Libreoffice-commits] core.git: vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl_blacklist.mk

2015-06-17 Thread Markus Mohrhard 
 vcl/Module_vcl.mk   |1 +
 vcl/Package_opengl_blacklist.mk |   16 
 vcl/opengl/opengl_blacklist_windows.xml |   11 +++
 vcl/opengl/win/blacklist.xml|   11 ---
 4 files changed, 28 insertions(+), 11 deletions(-)

New commits:
commit 56b1a63e670ed7e8c5cda4c86a23c347ce32a224
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Jun 5 02:32:01 2015 +0200

install blacklist into user profile

Change-Id: I2571fcdde1689f1a168a5c5d6bd20785ce018927
Reviewed-on: https://gerrit.libreoffice.org/16332
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index aa26183..4595375 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 CustomTarget_afm_hash \
 Library_vcl \
Package_opengl \
+   Package_opengl_blacklist \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
$(if $(ENABLE_HEADLESS),, \
diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk
new file mode 100644
index 000..b858a56
--- /dev/null
+++ b/vcl/Package_opengl_blacklist.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl))
+
+$(eval $(call 
gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
+   opengl_blacklist_windows.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/opengl/win/blacklist.xml 
b/vcl/opengl/opengl_blacklist_windows.xml
similarity index 100%
rename from vcl/opengl/win/blacklist.xml
rename to vcl/opengl/opengl_blacklist_windows.xml
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk vcl/qa

2015-06-05 Thread Michael Meeks 
 vcl/Module_vcl.mk|2 
 vcl/qa/cppunit/lifecycle.cxx |  102 +++
 2 files changed, 103 insertions(+), 1 deletion(-)

New commits:
commit 15499b1e4f2d31c2707d75800046f7fa12bb5dac
Author: Michael Meeks michael.me...@collabora.com
Date:   Fri Jun 5 12:49:05 2015 +0100

VclPtr - more extensive lifecycle tests.

Change-Id: Ifb5355b3a8f33601bcec0c11ce1afe1c735695b6
Reviewed-on: https://gerrit.libreoffice.org/16100
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 8cb05ba..aa26183 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -99,11 +99,11 @@ $(eval $(call gb_Module_add_targets,vcl,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,vcl,\
+   CppunitTest_vcl_lifecycle \
CppunitTest_vcl_bitmap_test \
CppunitTest_vcl_fontcharmap \
CppunitTest_vcl_complextext \
CppunitTest_vcl_filters_test \
-   CppunitTest_vcl_lifecycle \
CppunitTest_vcl_outdev \
CppunitTest_vcl_app_test \
CppunitTest_vcl_wmf_test \
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index d3b15d0..afc77b3 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -17,6 +17,8 @@
 #include vcl/field.hxx
 #include vcl/virdev.hxx
 #include vcl/tabctrl.hxx
+#include vcl/dialog.hxx
+#include vcl/layout.hxx
 
 class LifecycleTest : public test::BootstrapFixture
 {
@@ -33,6 +35,7 @@ public:
 void testChildDispose();
 void testPostDispose();
 void testFocus();
+void testLeakage();
 
 CPPUNIT_TEST_SUITE(LifecycleTest);
 CPPUNIT_TEST(testCast);
@@ -43,6 +46,7 @@ public:
 CPPUNIT_TEST(testChildDispose);
 CPPUNIT_TEST(testPostDispose);
 CPPUNIT_TEST(testFocus);
+CPPUNIT_TEST(testLeakage);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -183,6 +187,104 @@ void LifecycleTest::testFocus()
 // CPPUNIT_ASSERT(xChild-HasFocus());
 }
 
+template class vcl_type
+class LeakTestClass : public vcl_type
+{
+bool mrDeleted;
+public:
+templatetypename... Arg
+LeakTestClass(bool bDeleted, Arg ... arg) :
+vcl_type(std::forwardArg(arg)...),
+mrDeleted(bDeleted)
+{
+mrDeleted = false;
+}
+~LeakTestClass()
+{
+mrDeleted = true;
+}
+};
+
+class LeakTestObject
+{
+boolmbDeleted;
+VclPtrvcl::Window mxRef;
+void   *mpRef;
+LeakTestObject() {}
+public:
+templatetypename vcl_type, typename... Arg static LeakTestObject *
+Create(Arg ... arg)
+{
+LeakTestObject *pNew = new LeakTestObject();
+pNew-mxRef = VclPtr LeakTestClass vcl_type  ::Create( 
pNew-mbDeleted,
+   
std::forwardArg(arg)...);
+pNew-mpRef = reinterpret_castvoid *(static_castvcl::Window 
*(pNew-mxRef));
+return pNew;
+}
+VclPtrvcl::Window getRef() { return mxRef; }
+void disposeAndClear()
+{
+mxRef.disposeAndClear();
+}
+void assertDeleted()
+{
+if (!mbDeleted)
+{
+OUStringBuffer aMsg = Type ';
+vcl::Window *pWin = reinterpret_castvcl::Window *(mpRef);
+aMsg.appendAscii(typeid(*pWin).name());
+aMsg.append(' not freed after dispose);
+CPPUNIT_FAIL(OUStringToOString(aMsg.makeStringAndClear(),
+   RTL_TEXTENCODING_UTF8).getStr());
+}
+}
+};
+
+void LifecycleTest::testLeakage()
+{
+std::vectorLeakTestObject * aObjects;
+
+// Create objects
+aObjects.push_back(LeakTestObject::CreateWorkWindow(nullptr, 
WB_APP|WB_STDWORK));
+VclPtrvcl::Window xParent = aObjects.back()-getRef();
+aObjects.push_back(LeakTestObject::CreatePushButton(xParent));
+aObjects.push_back(LeakTestObject::CreateOKButton(xParent));
+aObjects.push_back(LeakTestObject::CreateCancelButton(xParent));
+aObjects.push_back(LeakTestObject::CreateHelpButton(xParent));
+aObjects.push_back(LeakTestObject::CreateCheckBox(xParent));
+aObjects.push_back(LeakTestObject::CreateEdit(xParent));
+aObjects.push_back(LeakTestObject::CreateComboBox(xParent));
+aObjects.push_back(LeakTestObject::CreateRadioButton(xParent));
+
+#if 0
+{ // something that looks like a dialog
+
aObjects.push_back(LeakTestObject::CreateDialog(xParent,WB_CLIPCHILDREN|WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEABLE));
+VclPtrvcl::Window xDlgParent = aObjects.back()-getRef();
+
+aObjects.push_back(LeakTestObject::CreateVclVBox(xDlgParent));
+VclPtrvcl::Window xVBox = aObjects.back()-getRef();
+
+aObjects.push_back(LeakTestObject::CreateVclVButtonBox(xVBox));
+}
+
+aObjects.push_back(LeakTestObject::CreateModelessDialog(xParent,