rebaked after adding convautotest.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ddd506db6a1d5ee9d776857422608bc5443766e6..a804120a2f0c755231726b232cd8e897992e8236 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -59,6 +59,7 @@ TEST_OBJECTS =  \
        test_hashes.o \
        test_lists.o \
        test_longlongtest.o \
+       test_convautotest.o \
        test_mbconvtest.o \
        test_regextest.o \
        test_wxregextest.o \
@@ -302,6 +303,9 @@ test_lists.o: $(srcdir)/lists/lists.cpp $(TEST_ODEP)
 test_longlongtest.o: $(srcdir)/longlong/longlongtest.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/longlong/longlongtest.cpp
 
+test_convautotest.o: $(srcdir)/mbconv/convautotest.cpp $(TEST_ODEP)
+       $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/convautotest.cpp
+
 test_mbconvtest.o: $(srcdir)/mbconv/mbconvtest.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/mbconv/mbconvtest.cpp
 

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index b642d398cbc5499db05b710e1381f6f63c97dec4..4668e71faf66d710992dc425532bfae4856e89e2 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -49,6 +49,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_hashes.obj \
        $(OBJS)\test_lists.obj \
        $(OBJS)\test_longlongtest.obj \
+       $(OBJS)\test_convautotest.obj \
        $(OBJS)\test_mbconvtest.obj \
        $(OBJS)\test_regextest.obj \
        $(OBJS)\test_wxregextest.obj \
@@ -68,6 +69,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_tempfile.obj \
        $(OBJS)\test_textstreamtest.obj \
        $(OBJS)\test_zlibstream.obj \
+       $(OBJS)\test_textfiletest.obj \
        $(OBJS)\test_uris.obj
 TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -333,6 +335,9 @@ $(OBJS)\test_lists.obj: .\lists\lists.cpp
 $(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
@@ -390,6 +395,9 @@ $(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_uris.obj: .\uris\uris.cpp
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
 

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 33a99f14dc5621e3db179a3c2f12875a9ae51067..b3283c6c455ec8d24999d0913d401442939de49f 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -41,6 +41,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_hashes.o \
        $(OBJS)\test_lists.o \
        $(OBJS)\test_longlongtest.o \
+       $(OBJS)\test_convautotest.o \
        $(OBJS)\test_mbconvtest.o \
        $(OBJS)\test_regextest.o \
        $(OBJS)\test_wxregextest.o \
@@ -60,6 +61,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_tempfile.o \
        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
+       $(OBJS)\test_textfiletest.o \
        $(OBJS)\test_uris.o
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -318,6 +320,9 @@ $(OBJS)\test_lists.o: ./lists/lists.cpp
 $(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_convautotest.o: ./mbconv/convautotest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
@@ -375,6 +380,9 @@ $(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
 $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_uris.o: ./uris/uris.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 1765cd12c2146e8afda919eadac63ac169811ad7..5afa7eaf8da17b66dc4ffe2dbc2c5b349a7bf6fa 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -42,6 +42,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_hashes.obj \
        $(OBJS)\test_lists.obj \
        $(OBJS)\test_longlongtest.obj \
+       $(OBJS)\test_convautotest.obj \
        $(OBJS)\test_mbconvtest.obj \
        $(OBJS)\test_regextest.obj \
        $(OBJS)\test_wxregextest.obj \
@@ -61,6 +62,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_tempfile.obj \
        $(OBJS)\test_textstreamtest.obj \
        $(OBJS)\test_zlibstream.obj \
+       $(OBJS)\test_textfiletest.obj \
        $(OBJS)\test_uris.obj
 TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \
@@ -412,6 +414,9 @@ $(OBJS)\test_lists.obj: .\lists\lists.cpp
 $(OBJS)\test_longlongtest.obj: .\longlong\longlongtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_convautotest.obj: .\mbconv\convautotest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_mbconvtest.obj: .\mbconv\mbconvtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
@@ -469,6 +474,9 @@ $(OBJS)\test_textstreamtest.obj: .\streams\textstreamtest.cpp
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_uris.obj: .\uris\uris.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 

diff --git a/tests/makefile.wat b/tests/makefile.wat
index ee216c87d0fd42d920c658f5332900ecf19d5d5a..79504daa50af0bb76b6588f7fcec002b106a921d 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -239,6 +239,7 @@ TEST_OBJECTS =  &
        $(OBJS)\test_hashes.obj &
        $(OBJS)\test_lists.obj &
        $(OBJS)\test_longlongtest.obj &
+       $(OBJS)\test_convautotest.obj &
        $(OBJS)\test_mbconvtest.obj &
        $(OBJS)\test_regextest.obj &
        $(OBJS)\test_wxregextest.obj &
@@ -258,6 +259,7 @@ TEST_OBJECTS =  &
        $(OBJS)\test_tempfile.obj &
        $(OBJS)\test_textstreamtest.obj &
        $(OBJS)\test_zlibstream.obj &
+       $(OBJS)\test_textfiletest.obj &
        $(OBJS)\test_uris.obj
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@@ -366,6 +368,9 @@ $(OBJS)\test_lists.obj :  .AUTODEPEND .\lists\lists.cpp
 $(OBJS)\test_longlongtest.obj :  .AUTODEPEND .\longlong\longlongtest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_convautotest.obj :  .AUTODEPEND .\mbconv\convautotest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_mbconvtest.obj :  .AUTODEPEND .\mbconv\mbconvtest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -423,6 +428,9 @@ $(OBJS)\test_textstreamtest.obj :  .AUTODEPEND .\streams\textstreamtest.cpp
 $(OBJS)\test_zlibstream.obj :  .AUTODEPEND .\streams\zlibstream.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_textfiletest.obj :  .AUTODEPEND .\textfile\textfiletest.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 

diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index 781bfbbfbb758f8d8e59e935b44233754c1030a3..8c9d102307cba9bed779c05ef876c6e8b8892a8c 100644 (file)
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -447,6 +447,10 @@ SOURCE=.\streams\bstream.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\mbconv\convautotest.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\strings\crt.cpp
 # End Source File
 # Begin Source File
@@ -549,6 +553,10 @@ SOURCE=.\test.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\textfile\textfiletest.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\streams\textstreamtest.cpp
 # End Source File
 # Begin Source File