X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca5016d4ddae7f9a2d72a16326e9339f8d3e8748..743b426605478eeb31232c30e804e70ff493b1f2:/tests/test.bkl?ds=sidebyside

diff --git a/tests/test.bkl b/tests/test.bkl
index 8aa99d7080..b679cfb471 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -76,6 +76,7 @@
             streams/memstream.cpp
             streams/socketstream.cpp
             streams/sstream.cpp
+            streams/stdstream.cpp
             streams/tempfile.cpp
             streams/textstreamtest.cpp
             streams/zlibstream.cpp
@@ -84,6 +85,7 @@
             thread/queue.cpp
             thread/tls.cpp
             uris/uris.cpp
+            uris/url.cpp
             vectors/vectors.cpp
             weakref/evtconnection.cpp
             weakref/weakref.cpp
@@ -91,8 +93,8 @@
             xml/xmltest.cpp
         </sources>
         <wx-lib>net</wx-lib>
-        <wx-lib>base</wx-lib>
         <wx-lib>xml</wx-lib>
+        <wx-lib>base</wx-lib>
     </exe>
 
 
@@ -108,6 +110,7 @@
             geometry/rect.cpp
             geometry/size.cpp
             geometry/point.cpp
+            graphics/measuring.cpp
             config/config.cpp
             controls/comboboxtest.cpp
             controls/headerctrltest.cpp
@@ -118,11 +121,13 @@
             events/clone.cpp
             events/propagation.cpp
             font/fonttest.cpp
+            image/image.cpp
             image/rawbmp.cpp
             html/htmlwindow.cpp
             misc/guifuncs.cpp
             misc/selstoretest.cpp
             misc/garbage.cpp
+            misc/settings.cpp
             <!--
                 This one is intentionally duplicated here (it is also part of
                 non-GUI test) as sockets behave differently in console and GUI
@@ -145,6 +150,10 @@
 
     <wx-data id="data">
         <files>testdata.fc</files>
+        
+        <!-- test data for image/image.cpp test unit: -->
+        <files>horse.ani  horse.bmp  horse.cur  horse.gif  horse.ico  horse.jpg  
+               horse.pcx  horse.png  horse.pnm  horse.tga  horse.tif  horse.xpm</files>
     </wx-data>
 
     <template id="catalog">
@@ -156,15 +165,23 @@
     <wx-data id="fr" template="catalog"/>
 
 
-    <!-- BENCHMARKS -->
-
-    <exe id="printfbench" template="wx_sample_console,wx_test"
-                          template_append="wx_append_base">
-        <sources>
-            benchmarks/printfbench.cpp
-        </sources>
-        <wx-lib>base</wx-lib>
-    </exe>
-
+    <fragment format="autoconf">
+# notice the ugly hack with using CXXWARNINGS: we can't use CPPFLAGS as
+# currently the value in the makefile would be ignored if we did, but
+# 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:
+	@$(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 \
+	        echo "*** Compilation with TEST_INVALID_BIND_$$d unexpectedly succeeded.">&amp;2; \
+	        exit 1; \
+	    fi; \
+	done; \
+	exit 0
+
+.PHONY: failtest
+    </fragment>
 
 </makefile>