diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 16:20:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 16:20:11 +0200 |
| commit | a037f6338c19e16bcbc0674214666a786872c59d (patch) | |
| tree | 174abaa672294bc9d786c0f8283fefe323c805c1 | |
| parent | e7bbf98659260ac5756c43ec7513f1fa0833f62e (diff) | |
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
| -rw-r--r-- | vcl/Module_vcl.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 19f9f7667cf7..b1ef05d7bfee 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) \ )) |