X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dad08eca55c5cbd7e5d437740a0a943c8401b88..17beda75ef9780ebef5044e41889a9b598dcf186:/tests/test.bkl diff --git a/tests/test.bkl b/tests/test.bkl index 80b7eb176c..0c142a3409 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -15,7 +15,7 @@ <ldflags>$(CPPUNIT_LIBS)</ldflags> <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'"> - <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'"> + <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'"> <sources>dummy.cpp</sources> <precomp-headers-gen>dummy.cpp</precomp-headers-gen> </if> @@ -132,6 +132,7 @@ geometry/rect.cpp geometry/size.cpp geometry/point.cpp + geometry/region.cpp graphics/bitmap.cpp graphics/colour.cpp graphics/ellipsization.cpp @@ -147,6 +148,8 @@ controls/choicebooktest.cpp controls/choicetest.cpp controls/comboboxtest.cpp + controls/dataviewctrltest.cpp + controls/datepickerctrltest.cpp controls/frametest.cpp controls/gaugetest.cpp controls/gridtest.cpp @@ -169,6 +172,7 @@ controls/radiobuttontest.cpp controls/rearrangelisttest.cpp controls/richtextctrltest.cpp + controls/searchctrltest.cpp controls/slidertest.cpp controls/spinctrldbltest.cpp controls/spinctrltest.cpp @@ -178,9 +182,11 @@ controls/toolbooktest.cpp controls/treebooktest.cpp controls/treectrltest.cpp + controls/treelistctrltest.cpp controls/virtlistctrltest.cpp controls/webtest.cpp controls/windowtest.cpp + controls/dialogtest.cpp events/clone.cpp events/propagation.cpp events/keyboard.cpp @@ -209,7 +215,13 @@ window/setsize.cpp xml/xrctest.cpp </sources> - <wx-lib>web</wx-lib> + <!-- + Can't use <wx-lib> here as it doesn't work with conditionally + defined variables, so fall back <sys-lib> as we must not link with + inexisting webview library to be able to run tests even if + wxWebView is not available. + --> + <sys-lib>$(WXLIB_WEBVIEW)</sys-lib> <wx-lib>richtext</wx-lib> <wx-lib>media</wx-lib> <wx-lib>xrc</wx-lib> @@ -230,6 +242,14 @@ horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm</files> </wx-data> + <wx-data id="data-images"> + <srcdir>$(SRCDIR)/image</srcdir> + <dstdir>image</dstdir> + <files>horse_grey.bmp horse_grey_flipped.bmp + horse_rle4.bmp horse_rle4_flipped.bmp + horse_rle8.bmp horse_rle8_flipped.bmp</files> + </wx-data> + <template id="catalog"> <dstdir>$(BUILDDIR)/intl/$(id)</dstdir> <srcdir>$(SRCDIR)/intl/$(id)</srcdir> @@ -245,7 +265,17 @@ # warnings don't matter when we expect compilation to fail anyhow so we can # use this variable to enable the compilation of code which is supposed to # fail -failtest: +failtest: failtest_combobox failtest_evthandler + +failtest_combobox: + @$(RM) test_gui_comboboxtest.o + if $(MAKE) CXXWARNINGS=-DTEST_INVALID_COMBOBOX_ISEMPTY test_gui_comboboxtest.o 2>/dev/null; then \ + echo "*** Compilation with TEST_INVALID_COMBOBOX_ISEMPTY unexpectedly succeeded.">&2; \ + exit 1; \ + fi; \ + exit 0 + +failtest_evthandler: @$(RM) test_evthandler.o @for d in GLOBAL STATIC METHOD FUNCTOR NO_HANDLER DERIVED WRONG_CLASS; do \ if $(MAKE) CXXWARNINGS=-DTEST_INVALID_BIND_$$d test_evthandler.o 2>/dev/null; then \