applied rest of streams test suite patch

[wxWidgets.git] / tests / test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index 1932b0ac07edb7e2aee61eaf3257e68b892ffe6a..7819fd082c4027ce53fc8241b488453deb8d5784 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -3,22 +3,6 @@
 
 <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"
@@ -31,7 +15,11 @@
             filesys/filesys.cpp
             arrays/arrays.cpp
             longlong/longlong.cpp
-            $(STREAMS_FILES)
+            streams/bstream.cpp
+            streams/ffilestream.cpp
+            streams/filestream.cpp
+            streams/memstream.cpp
+            streams/zlibstream.cpp
         </sources>
         <wx-lib>base</wx-lib>
     </exe>