wxGetenv was incorrectly implemented, caching prevented it from reflecting environmen...

[wxWidgets.git] / tests / test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index 1932b0ac07edb7e2aee61eaf3257e68b892ffe6a..0d0102281eec861280d37e8789b0d0765437c932 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -3,22 +3,6 @@
 
 <makefile>
 
 
 <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'">
-            streams/bstream.cpp
-            streams/ffilestream.cpp
-            streams/filestream.cpp
-            streams/memstream.cpp
-            streams/zlibstream.cpp
-        </if>
-    </set>
-

     <include file="../build/bakefiles/common_samples.bkl"/>
 
     <exe id="test" template="wx_test_console"
     <include file="../build/bakefiles/common_samples.bkl"/>
 
     <exe id="test" template="wx_test_console"


@@ -28,12 +12,26 @@
             mbconv/main.cpp
             formatconverter/formatconverter.cpp
             regex/regex.cpp
             mbconv/main.cpp
             formatconverter/formatconverter.cpp
             regex/regex.cpp

+            regex/wxregex.cpp

             filesys/filesys.cpp
             arrays/arrays.cpp
             filesys/filesys.cpp
             arrays/arrays.cpp

+            hashes/hashes.cpp

             longlong/longlong.cpp
             longlong/longlong.cpp

-            $(STREAMS_FILES)
+            strings/strings.cpp
+            strings/stdstrings.cpp
+            strings/unicode.cpp
+            strings/crt.cpp
+            streams/bstream.cpp
+            streams/ffilestream.cpp
+            streams/filestream.cpp
+            streams/memstream.cpp
+            streams/zlibstream.cpp

         </sources>
         <wx-lib>base</wx-lib>
     </exe>
 
         </sources>
         <wx-lib>base</wx-lib>
     </exe>
 

+    <wx-data id="data">
+        <files>testdata.fc</files>
+    </wx-data>
+

 </makefile>
 </makefile>