X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/409fe759e1b605514eabcddfb546dc876b9a9161..46629a0a1ce01a58596ed1ce206e1c8feb6f641a:/tests/test.bkl diff --git a/tests/test.bkl b/tests/test.bkl index ba5bf00ae7..6fc4e1802a 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> @@ -40,6 +40,7 @@ config/regconf.cpp datetime/datetimetest.cpp events/evthandler.cpp + events/evtlooptest.cpp events/evtsource.cpp events/stopwatch.cpp events/timertest.cpp @@ -132,6 +133,7 @@ geometry/rect.cpp geometry/size.cpp geometry/point.cpp + geometry/region.cpp graphics/bitmap.cpp graphics/colour.cpp graphics/ellipsization.cpp @@ -171,6 +173,8 @@ controls/radiobuttontest.cpp controls/rearrangelisttest.cpp controls/richtextctrltest.cpp + controls/searchctrltest.cpp + controls/simplebooktest.cpp controls/slidertest.cpp controls/spinctrldbltest.cpp controls/spinctrltest.cpp @@ -180,11 +184,23 @@ 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 + <!-- + Duplicate this file here to test GUI event loops too. + --> + events/evtlooptest.cpp events/propagation.cpp events/keyboard.cpp + <!-- + And duplicate this one too as wxExecute behaves differently in + console and GUI applications. + --> + exec/exec.cpp font/fonttest.cpp image/image.cpp image/rawbmp.cpp @@ -210,6 +226,13 @@ window/setsize.cpp xml/xrctest.cpp </sources> + <!-- + 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> @@ -233,9 +256,26 @@ <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> + <files> + horse_grey.bmp horse_grey_flipped.bmp + horse_rle4.bmp horse_rle4_flipped.bmp + horse_rle8.bmp horse_rle8_flipped.bmp + + horse_bicubic_50x50.png + horse_bicubic_100x100.png + horse_bicubic_150x150.png + horse_bicubic_300x300.png + + horse_bilinear_50x50.png + horse_bilinear_100x100.png + horse_bilinear_150x150.png + horse_bilinear_300x300.png + + horse_box_average_50x50.png + horse_box_average_100x100.png + horse_box_average_150x150.png + horse_box_average_300x300.png + </files> </wx-data> <template id="catalog"> @@ -253,7 +293,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 \