X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08bc54902d8baf804c5b6e86a250af019758c9ce..878ddad57a352a5609fd7bfd63406ed5f2aac564:/tests/test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index 1932b0ac07..16bb6666af 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -3,37 +3,83 @@
 
 <makefile>
 
-    <!-- FIXME: temporary hack.
-         Override this on command line, e.g.
-         bakefile_gen -f autoconf -b ../../tests/*.bkl -DBUILD_STREAM_TESTS=1
-    -->
-    <set var="BUILD_STREAM_TESTS">0</set>
-
-    <set var="STREAMS_FILES">
-        <if cond="BUILD_STREAM_TESTS=='1'">
+    <include file="../build/bakefiles/common_samples.bkl"/>
+
+    <template id="wx_test">
+        <cppflags>$(CPPUNIT_CFLAGS)</cppflags>
+        <ldflags>$(CPPUNIT_LIBS)</ldflags>
+
+        <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
+            <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+                <sources>dummy.cpp</sources>
+                <precomp-headers-gen>dummy.cpp</precomp-headers-gen>
+            </if>
+            <precomp-headers-header>testprec.h</precomp-headers-header>
+            <precomp-headers>on</precomp-headers>
+            <precomp-headers-file>testprec_$(id)</precomp-headers-file>
+        </if>
+    </template>
+
+    <exe id="test" template="wx_sample_console,wx_test"
+                   template_append="wx_append_base">
+        <sources>
+            test.cpp
+            archive/archivetest.cpp
+            archive/ziptest.cpp
+            arrays/arrays.cpp
+            datetime/datetimetest.cpp
+            fileconf/fileconftest.cpp
+            filekind/filekind.cpp
+            filename/filenametest.cpp
+            filesys/filesystest.cpp
+            fontmap/fontmaptest.cpp
+            formatconverter/formatconvertertest.cpp
+            hashes/hashes.cpp
+            lists/lists.cpp
+            longlong/longlongtest.cpp
+            mbconv/mbconvtest.cpp
+            regex/regextest.cpp
+            regex/wxregextest.cpp
+            strings/strings.cpp
+            strings/stdstrings.cpp
+            strings/unicode.cpp
+            strings/crt.cpp
             streams/bstream.cpp
+            streams/datastreamtest.cpp
             streams/ffilestream.cpp
             streams/filestream.cpp
+            streams/largefile.cpp
             streams/memstream.cpp
+            streams/sstream.cpp
+            streams/textstreamtest.cpp
             streams/zlibstream.cpp
-        </if>
-    </set>
+            uris/uris.cpp
+        </sources>
+        <wx-lib>net</wx-lib>
+        <wx-lib>base</wx-lib>
+    </exe>
 
-    <include file="../build/bakefiles/common_samples.bkl"/>
 
-    <exe id="test" template="wx_test_console"
-                   template_append="wx_append_base">
+    <exe id="test_gui" template="wx_sample,wx_test"
+                       template_append="wx_append"
+         cond="USE_GUI=='1'">
+
+        <!-- link against GUI libraries, but be a console app: -->
+        <app-type>console</app-type>
+
         <sources>
             test.cpp
-            mbconv/main.cpp
-            formatconverter/formatconverter.cpp
-            regex/regex.cpp
-            filesys/filesys.cpp
-            arrays/arrays.cpp
-            longlong/longlong.cpp
-            $(STREAMS_FILES)
+            geometry/rect.cpp
+            geometry/size.cpp
+            geometry/point.cpp
         </sources>
+        <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </exe>
 
+
+    <wx-data id="data">
+        <files>testdata.fc</files>
+    </wx-data>
+
 </makefile>