Removed ctl3d and erroneous makefiles from scripts

[wxWidgets.git] / tests / test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index 65c8391c83e68983f935a4542bd12f8bede99658..0dbfbf1924f60bbb8dda910cc0284bba2196b330 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -5,19 +5,37 @@
 
     <include file="../build/bakefiles/common_samples.bkl"/>
 
-    <exe id="test" template="wx_test_console"
+    <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
@@ -27,10 +45,13 @@
             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/tempfile.cpp
             streams/textstreamtest.cpp
             streams/zlibstream.cpp
             uris/uris.cpp
@@ -39,6 +60,25 @@
         <wx-lib>base</wx-lib>
     </exe>
 
+
+    <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
+            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>