fixed most of the tests to process in rbuild. will fix linking in a bit

svn path=/trunk/; revision=19168

diff --git a/rosapps/tests/README.txt b/rosapps/tests/README.txt
index 8dbc5d6..86aa8ca 100644 (file)
--- a/rosapps/tests/README.txt
+++ b/rosapps/tests/README.txt
@@ -1,3 +1,4 @@
-This folder contains tests that are not merged in to the new regression system.
+This folder contains tests that are not merged in to 
+the new regression testing system.

 
 Please DO NOT add new tests here.
\ No newline at end of file
 
 Please DO NOT add new tests here.
\ No newline at end of file

diff --git a/rosapps/tests/bench/bench.xml b/rosapps/tests/bench/bench.xml
index 3343a36..5478708 100644 (file)
--- a/rosapps/tests/bench/bench.xml
+++ b/rosapps/tests/bench/bench.xml
@@ -1,8 +1,8 @@
-<module name="bench" type="win32gui" installbase="bin" installname="bench.exe">\r
+<module name="bench-thread" type="win32gui" installbase="bin" installname="bench-thread.exe">\r

        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>bench.c</file>\r
+       <file>bench-thread.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/button/button.xml b/rosapps/tests/button/button.xml
index e695ae0..f34c86c 100644 (file)
--- a/rosapps/tests/button/button.xml
+++ b/rosapps/tests/button/button.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>button.c</file>\r
+       <file>buttontst.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/button2/button2.xml b/rosapps/tests/button2/button2.xml
index 6724db5..bdba5c7 100644 (file)
--- a/rosapps/tests/button2/button2.xml
+++ b/rosapps/tests/button2/button2.xml
@@ -1,8 +1,8 @@
-<module name="button2" type="win32gui" installbase="bin" installname="button2.exe">\r
+<module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe">\r

        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>button2.c</file>\r
+       <file>buttontst2.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/directory.xml b/rosapps/tests/directory.xml
index 4fe353f..ecf9260 100644 (file)
--- a/rosapps/tests/directory.xml
+++ b/rosapps/tests/directory.xml
@@ -130,9 +130,9 @@
 <directory name="linetest">
        <xi:include href="linetest/linetest.xml" />
 </directory>
 <directory name="linetest">
        <xi:include href="linetest/linetest.xml" />
 </directory>

-<directory name="lpctst">
-       <xi:include href="lpctst/lpctst.xml" />
-</directory>
+
+<!-- fixme: lpctst -->
+

 <directory name="map_dup_inherit">
        <xi:include href="map_dup_inherit/map_dup_inherit.xml" />
 </directory>
 <directory name="map_dup_inherit">
        <xi:include href="map_dup_inherit/map_dup_inherit.xml" />
 </directory>


@@ -148,9 +148,9 @@
 <directory name="moztest">
        <xi:include href="moztest/moztest.xml" />
 </directory>
 <directory name="moztest">
        <xi:include href="moztest/moztest.xml" />
 </directory>

-<directory name="mstest">
-       <xi:include href="mstest/mstest.xml" />
-</directory>
+
+<!--  fixme: mstest -->
+

 <directory name="multithrdwin">
        <xi:include href="multithrdwin/multithrdwin.xml" />
 </directory>
 <directory name="multithrdwin">
        <xi:include href="multithrdwin/multithrdwin.xml" />
 </directory>


@@ -166,9 +166,9 @@
 <directory name="noexecute">
        <xi:include href="noexecute/noexecute.xml" />
 </directory>
 <directory name="noexecute">
        <xi:include href="noexecute/noexecute.xml" />
 </directory>

-<directory name="nptest">
-       <xi:include href="nptest/nptest.xml" />
-</directory>
+
+<!-- fixme: nptest -->
+

 <directory name="oskittcp">
        <xi:include href="oskittcp/oskittcp.xml" />
 </directory>
 <directory name="oskittcp">
        <xi:include href="oskittcp/oskittcp.xml" />
 </directory>


@@ -211,9 +211,9 @@
 <directory name="shaptest">
        <xi:include href="shaptest/shaptest.xml" />
 </directory>
 <directory name="shaptest">
        <xi:include href="shaptest/shaptest.xml" />
 </directory>

-<directory name="shm">
-       <xi:include href="shm/shm.xml" />
-</directory>
+
+<!-- fixme: shm -->
+

 <directory name="statst">
        <xi:include href="statst/statst.xml" />
 </directory>
 <directory name="statst">
        <xi:include href="statst/statst.xml" />
 </directory>


@@ -253,8 +253,7 @@
 <directory name="txtscale">
        <xi:include href="txtscale/txtscale.xml" />
 </directory>
 <directory name="txtscale">
        <xi:include href="txtscale/txtscale.xml" />
 </directory>

-
-<directory name="vmtest/vmtest">
+<directory name="vmtest">

        <xi:include href="vmtest/vmtest.xml" />
 </directory>
 <directory name="wclickat">
        <xi:include href="vmtest/vmtest.xml" />
 </directory>
 <directory name="wclickat">

diff --git a/rosapps/tests/dnsapi/dnsapi.xml b/rosapps/tests/dnsapi/dnsapi.xml
index d016ff7..f1fb121 100644 (file)
--- a/rosapps/tests/dnsapi/dnsapi.xml
+++ b/rosapps/tests/dnsapi/dnsapi.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>dnsapitst.c</file>\r
+       <file>dnsapi.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/edit/edit.xml b/rosapps/tests/edit/edit.xml
index 00cd7bc..e34d53c 100644 (file)
--- a/rosapps/tests/edit/edit.xml
+++ b/rosapps/tests/edit/edit.xml
@@ -4,5 +4,6 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>edit.c</file>\r
+       <file>edittest.c</file>\r
+       <file>utils.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/enumfonts/enumfonts.xml b/rosapps/tests/enumfonts/enumfonts.xml
index 78a1e8f..2c51aee 100644 (file)
--- a/rosapps/tests/enumfonts/enumfonts.xml
+++ b/rosapps/tests/enumfonts/enumfonts.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>enumfonts.c</file>\r
+       <file>enumfonts.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/iptest/iptest.xml b/rosapps/tests/iptest/iptest.xml
index c013f18..f7e9aae 100644 (file)
--- a/rosapps/tests/iptest/iptest.xml
+++ b/rosapps/tests/iptest/iptest.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>iptest.c</file>\r
+       <file>iptest.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/lantst/lantest.xml b/rosapps/tests/lantst/lantest.xml
index 640fcc9..41c63e0 100644 (file)
--- a/rosapps/tests/lantst/lantest.xml
+++ b/rosapps/tests/lantst/lantest.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>lantest.c</file>\r
+       <file>lantest.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/map_dup_inherit/map_dup_inherit.xml b/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
index 82b3972..e6fed0a 100644 (file)
--- a/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
+++ b/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>map_dup_inherit</file>\r
+       <file>map_dup_inherit.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/oskittcp/oskittcp.xml b/rosapps/tests/oskittcp/oskittcp.xml
index c922151..60c3fc6 100644 (file)
--- a/rosapps/tests/oskittcp/oskittcp.xml
+++ b/rosapps/tests/oskittcp/oskittcp.xml
@@ -1,8 +1,8 @@
-<module name="oskittcp" type="win32gui" installbase="bin" installname="oskittcp.exe">\r
+<module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe">\r

        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>oskittcp.c</file>\r
+       <file>tcptest.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/palbitblt/palbitblt.xml b/rosapps/tests/palbitblt/palbitblt.xml
index b671553..041cc88 100644 (file)
--- a/rosapps/tests/palbitblt/palbitblt.xml
+++ b/rosapps/tests/palbitblt/palbitblt.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>palbitblt.c</file>\r
+       <file>pal.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/patblt/patblt.xml b/rosapps/tests/patblt/patblt.xml
index ff9cf87..e817a70 100644 (file)
--- a/rosapps/tests/patblt/patblt.xml
+++ b/rosapps/tests/patblt/patblt.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>patblt.c</file>\r
+       <file>patblt.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/polytest/polytest.xml b/rosapps/tests/polytest/polytest.xml
index 13b814c..79079c2 100644 (file)
--- a/rosapps/tests/polytest/polytest.xml
+++ b/rosapps/tests/polytest/polytest.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>polytest.c</file>\r
+       <file>polytest.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/primitives/primitives.xml b/rosapps/tests/primitives/primitives.xml
index 23127e4..5183263 100644 (file)
--- a/rosapps/tests/primitives/primitives.xml
+++ b/rosapps/tests/primitives/primitives.xml
@@ -4,5 +4,6 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>primitives.c</file>\r
+       <file>primitives.cpp</file>\r
+       <file>mk_font.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/stretchblt/stretchblt.xml b/rosapps/tests/stretchblt/stretchblt.xml
index 50c3056..b5c21a0 100644 (file)
--- a/rosapps/tests/stretchblt/stretchblt.xml
+++ b/rosapps/tests/stretchblt/stretchblt.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>stretchblt.c</file>\r
+       <file>stretchblt.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/tmrqueue/tmrqueue.xml b/rosapps/tests/tmrqueue/tmrqueue.xml
index 51a140c..35dec3e 100644 (file)
--- a/rosapps/tests/tmrqueue/tmrqueue.xml
+++ b/rosapps/tests/tmrqueue/tmrqueue.xml
@@ -1,8 +1,8 @@
-<module name="tnrqueue" type="win32gui" installbase="bin" installname="tnrqueue.exe">\r
+<module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe">\r

        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="_WIN32_IE">0x0501</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>tnrqueue.c</file>\r
+       <file>tmrqueue.c</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/txtscale/txtscale.xml b/rosapps/tests/txtscale/txtscale.xml
index 5a2e1de..32aa983 100644 (file)
--- a/rosapps/tests/txtscale/txtscale.xml
+++ b/rosapps/tests/txtscale/txtscale.xml
@@ -4,5 +4,6 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>txtscale.c</file>\r
+       <file>txtscale.cpp</file>\r
+       <file>mk_font.cpp</file>\r

 </module>\r
 </module>\r

diff --git a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml b/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml
index 011db48..5b6afeb 100644 (file)
--- a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml
+++ b/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml
@@ -4,5 +4,5 @@
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r
        <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>gdi32</library>\r

-       <file>wm_erasebkgnd.c</file>\r
+       <file>wm_erasebkgnd.cpp</file>\r

 </module>\r
 </module>\r