X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec0e0939137473cdd18aab3713b9aa91e25bba9c..04a123c642b0fc589e29cdd507faf11b85973f79:/tests/test.bkl?ds=sidebyside

diff --git a/tests/test.bkl b/tests/test.bkl
index 34e0e723c1..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>
@@ -37,12 +37,15 @@
             base64/base64.cpp
             cmdline/cmdlinetest.cpp
             config/fileconf.cpp
+            config/regconf.cpp
             datetime/datetimetest.cpp
             events/evthandler.cpp
             events/evtsource.cpp
             events/stopwatch.cpp
             events/timertest.cpp
             exec/exec.cpp
+            file/dir.cpp
+            file/filefn.cpp
             file/filetest.cpp
             filekind/filekind.cpp
             filename/filenametest.cpp
@@ -51,13 +54,20 @@
             formatconverter/formatconvertertest.cpp
             fswatcher/fswatchertest.cpp
             hashes/hashes.cpp
+            interactive/output.cpp
+            interactive/input.cpp
             intl/intltest.cpp
             lists/lists.cpp
             log/logtest.cpp
             longlong/longlongtest.cpp
             mbconv/convautotest.cpp
             mbconv/mbconvtest.cpp
+            misc/dynamiclib.cpp
+            misc/environ.cpp
+            misc/metatest.cpp
             misc/misctests.cpp
+            misc/module.cpp
+            misc/pathlist.cpp
             misc/typeinfotest.cpp
             net/ipc.cpp
             net/socket.cpp
@@ -65,6 +75,7 @@
             regex/wxregextest.cpp
             scopeguard/scopeguardtest.cpp
             strings/iostream.cpp
+            strings/numformatter.cpp
             strings/strings.cpp
             strings/stdstrings.cpp
             strings/tokenizer.cpp
@@ -115,28 +126,77 @@
         <app-type>console</app-type>
 
         <sources>
+            asserthelper.cpp
             test.cpp
+            testableframe.cpp
             geometry/rect.cpp
             geometry/size.cpp
             geometry/point.cpp
+            geometry/region.cpp
             graphics/bitmap.cpp
             graphics/colour.cpp
             graphics/ellipsization.cpp
             graphics/measuring.cpp
+            graphics/affinematrix.cpp
             config/config.cpp
+            controls/bitmapcomboboxtest.cpp
+            controls/bitmaptogglebuttontest.cpp
+            controls/bookctrlbasetest.cpp
+            controls/buttontest.cpp
+            controls/checkboxtest.cpp
+            controls/checklistboxtest.cpp
+            controls/choicebooktest.cpp
+            controls/choicetest.cpp
             controls/comboboxtest.cpp
+            controls/dataviewctrltest.cpp
+            controls/datepickerctrltest.cpp
+            controls/frametest.cpp
+            controls/gaugetest.cpp
+            controls/gridtest.cpp
             controls/headerctrltest.cpp
+            controls/htmllboxtest.cpp
+            controls/hyperlinkctrltest.cpp
+            controls/itemcontainertest.cpp
             controls/label.cpp
+            controls/listbasetest.cpp
+            controls/listbooktest.cpp
+            controls/listboxtest.cpp
             controls/listctrltest.cpp
+            controls/listviewtest.cpp
+            controls/markuptest.cpp
+            controls/notebooktest.cpp
+            controls/ownerdrawncomboboxtest.cpp
+            controls/pickerbasetest.cpp
+            controls/pickertest.cpp
+            controls/radioboxtest.cpp
+            controls/radiobuttontest.cpp
+            controls/rearrangelisttest.cpp
+            controls/richtextctrltest.cpp
+            controls/searchctrltest.cpp
+            controls/slidertest.cpp
+            controls/spinctrldbltest.cpp
+            controls/spinctrltest.cpp
             controls/textctrltest.cpp
             controls/textentrytest.cpp
+            controls/togglebuttontest.cpp
+            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
             font/fonttest.cpp
             image/image.cpp
             image/rawbmp.cpp
+            html/htmlparser.cpp
             html/htmlwindow.cpp
+            menu/accelentry.cpp
+            menu/menu.cpp
             misc/guifuncs.cpp
             misc/selstoretest.cpp
             misc/garbage.cpp
@@ -148,9 +208,21 @@
              -->
             net/socket.cpp
             sizers/boxsizer.cpp
+            sizers/wrapsizer.cpp
+            toplevel/toplevel.cpp
+            validators/valnum.cpp
             window/clientsize.cpp
             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>
         <wx-lib>xml</wx-lib>
@@ -170,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>
@@ -185,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.">&amp;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 \