From 9222c61388957c628110810e3c3e37ed49df96a0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 21 Jul 2007 23:51:19 +0000 Subject: [PATCH] updated after fileconf/fileconftest.cpp to config/fileconf.cpp move git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/Makefile.in | 14 +++++++++----- tests/makefile.bcc | 16 ++++++++++++---- tests/makefile.gcc | 16 ++++++++++++---- tests/makefile.vc | 16 ++++++++++++---- tests/makefile.wat | 16 ++++++++++++---- tests/test.bkl | 3 ++- tests/test_test.dsp | 2 +- tests/test_test_gui.dsp | 4 ++++ 8 files changed, 64 insertions(+), 23 deletions(-) diff --git a/tests/Makefile.in b/tests/Makefile.in index 3f0419a..3fbd386 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -55,8 +55,8 @@ TEST_OBJECTS = \ test_tartest.o \ test_arrays.o \ test_base64.o \ + test_fileconf.o \ test_datetimetest.o \ - test_fileconftest.o \ test_filekind.o \ test_filenametest.o \ test_filesystest.o \ @@ -105,7 +105,8 @@ TEST_GUI_OBJECTS = \ test_gui_test.o \ test_gui_rect.o \ test_gui_size.o \ - test_gui_point.o + test_gui_point.o \ + test_gui_config.o TEST_GUI_ODEP = $(___pch_testprec_test_gui_testprec_h_gch___depname) PRINTFBENCH_CXXFLAGS = $(__printfbench_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -328,12 +329,12 @@ test_arrays.o: $(srcdir)/arrays/arrays.cpp $(TEST_ODEP) test_base64.o: $(srcdir)/base64/base64.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/base64/base64.cpp +test_fileconf.o: $(srcdir)/config/fileconf.cpp $(TEST_ODEP) + $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/config/fileconf.cpp + test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/datetime/datetimetest.cpp -test_fileconftest.o: $(srcdir)/fileconf/fileconftest.cpp $(TEST_ODEP) - $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/fileconf/fileconftest.cpp - test_filekind.o: $(srcdir)/filekind/filekind.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/filekind/filekind.cpp @@ -460,6 +461,9 @@ test_gui_size.o: $(srcdir)/geometry/size.cpp $(TEST_GUI_ODEP) test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/geometry/point.cpp +test_gui_config.o: $(srcdir)/config/config.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/config/config.cpp + printfbench_printfbench.o: $(srcdir)/benchmarks/printfbench.cpp $(PRINTFBENCH_ODEP) $(CXXC) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(srcdir)/benchmarks/printfbench.cpp diff --git a/tests/makefile.bcc b/tests/makefile.bcc index 0baf188..005bb1f 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -42,8 +42,9 @@ TEST_OBJECTS = \ $(OBJS)\test_ziptest.obj \ $(OBJS)\test_tartest.obj \ $(OBJS)\test_arrays.obj \ + $(OBJS)\test_base64.obj \ + $(OBJS)\test_fileconf.obj \ $(OBJS)\test_datetimetest.obj \ - $(OBJS)\test_fileconftest.obj \ $(OBJS)\test_filekind.obj \ $(OBJS)\test_filenametest.obj \ $(OBJS)\test_filesystest.obj \ @@ -93,7 +94,8 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_test.obj \ $(OBJS)\test_gui_rect.obj \ $(OBJS)\test_gui_size.obj \ - $(OBJS)\test_gui_point.obj + $(OBJS)\test_gui_point.obj \ + $(OBJS)\test_gui_config.obj PRINTFBENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -352,10 +354,13 @@ $(OBJS)\test_tartest.obj: .\archive\tartest.cpp $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** -$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp +$(OBJS)\test_base64.obj: .\base64\base64.cpp + $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** -$(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp +$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** $(OBJS)\test_filekind.obj: .\filekind\filekind.cpp @@ -487,6 +492,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp $(OBJS)\test_gui_point.obj: .\geometry\point.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $** +$(OBJS)\test_gui_config.obj: .\config\config.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $** + $(OBJS)\printfbench_dummy.obj: .\dummy.cpp $(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H $** diff --git a/tests/makefile.gcc b/tests/makefile.gcc index b24fac7..ef3d1d6 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -34,8 +34,9 @@ TEST_OBJECTS = \ $(OBJS)\test_ziptest.o \ $(OBJS)\test_tartest.o \ $(OBJS)\test_arrays.o \ + $(OBJS)\test_base64.o \ + $(OBJS)\test_fileconf.o \ $(OBJS)\test_datetimetest.o \ - $(OBJS)\test_fileconftest.o \ $(OBJS)\test_filekind.o \ $(OBJS)\test_filenametest.o \ $(OBJS)\test_filesystest.o \ @@ -86,7 +87,8 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_test.o \ $(OBJS)\test_gui_rect.o \ $(OBJS)\test_gui_size.o \ - $(OBJS)\test_gui_point.o + $(OBJS)\test_gui_point.o \ + $(OBJS)\test_gui_config.o PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -330,10 +332,13 @@ $(OBJS)\test_tartest.o: ./archive/tartest.cpp $(OBJS)\test_arrays.o: ./arrays/arrays.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp +$(OBJS)\test_base64.o: ./base64/base64.cpp + $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\test_fileconf.o: ./config/fileconf.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp +$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\test_filekind.o: ./filekind/filekind.cpp @@ -465,6 +470,9 @@ $(OBJS)\test_gui_size.o: ./geometry/size.cpp $(OBJS)\test_gui_point.o: ./geometry/point.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_config.o: ./config/config.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\printfbench_dummy.o: ./dummy.cpp $(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $< diff --git a/tests/makefile.vc b/tests/makefile.vc index 75962ed..dd9c4c8 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -35,8 +35,9 @@ TEST_OBJECTS = \ $(OBJS)\test_ziptest.obj \ $(OBJS)\test_tartest.obj \ $(OBJS)\test_arrays.obj \ + $(OBJS)\test_base64.obj \ + $(OBJS)\test_fileconf.obj \ $(OBJS)\test_datetimetest.obj \ - $(OBJS)\test_fileconftest.obj \ $(OBJS)\test_filekind.obj \ $(OBJS)\test_filenametest.obj \ $(OBJS)\test_filesystest.obj \ @@ -89,7 +90,8 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_test.obj \ $(OBJS)\test_gui_rect.obj \ $(OBJS)\test_gui_size.obj \ - $(OBJS)\test_gui_point.obj + $(OBJS)\test_gui_point.obj \ + $(OBJS)\test_gui_config.obj PRINTFBENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_38)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(OBJS)\printfbench.pdb $(____DEBUGRUNTIME) \ $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ @@ -437,10 +439,13 @@ $(OBJS)\test_tartest.obj: .\archive\tartest.cpp $(OBJS)\test_arrays.obj: .\arrays\arrays.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** -$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp +$(OBJS)\test_base64.obj: .\base64\base64.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_fileconf.obj: .\config\fileconf.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** -$(OBJS)\test_fileconftest.obj: .\fileconf\fileconftest.cpp +$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** $(OBJS)\test_filekind.obj: .\filekind\filekind.cpp @@ -572,6 +577,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp $(OBJS)\test_gui_point.obj: .\geometry\point.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** +$(OBJS)\test_gui_config.obj: .\config\config.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** + $(OBJS)\printfbench_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) /Yctestprec.h $** diff --git a/tests/makefile.wat b/tests/makefile.wat index 666adb5..295d7b6 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -239,8 +239,9 @@ TEST_OBJECTS = & $(OBJS)\test_ziptest.obj & $(OBJS)\test_tartest.obj & $(OBJS)\test_arrays.obj & + $(OBJS)\test_base64.obj & + $(OBJS)\test_fileconf.obj & $(OBJS)\test_datetimetest.obj & - $(OBJS)\test_fileconftest.obj & $(OBJS)\test_filekind.obj & $(OBJS)\test_filenametest.obj & $(OBJS)\test_filesystest.obj & @@ -290,7 +291,8 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_test.obj & $(OBJS)\test_gui_rect.obj & $(OBJS)\test_gui_size.obj & - $(OBJS)\test_gui_point.obj + $(OBJS)\test_gui_point.obj & + $(OBJS)\test_gui_config.obj PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & @@ -385,10 +387,13 @@ $(OBJS)\test_tartest.obj : .AUTODEPEND .\archive\tartest.cpp $(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< -$(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp +$(OBJS)\test_base64.obj : .AUTODEPEND .\base64\base64.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + +$(OBJS)\test_fileconf.obj : .AUTODEPEND .\config\fileconf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< -$(OBJS)\test_fileconftest.obj : .AUTODEPEND .\fileconf\fileconftest.cpp +$(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(OBJS)\test_filekind.obj : .AUTODEPEND .\filekind\filekind.cpp @@ -520,6 +525,9 @@ $(OBJS)\test_gui_size.obj : .AUTODEPEND .\geometry\size.cpp $(OBJS)\test_gui_point.obj : .AUTODEPEND .\geometry\point.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_config.obj : .AUTODEPEND .\config\config.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< + $(OBJS)\printfbench_dummy.obj : .AUTODEPEND .\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $< diff --git a/tests/test.bkl b/tests/test.bkl index 6298abd..81a0f71 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -29,8 +29,8 @@ archive/tartest.cpp arrays/arrays.cpp base64/base64.cpp + config/fileconf.cpp datetime/datetimetest.cpp - fileconf/fileconftest.cpp filekind/filekind.cpp filename/filenametest.cpp filesys/filesystest.cpp @@ -86,6 +86,7 @@ geometry/rect.cpp geometry/size.cpp geometry/point.cpp + config/config.cpp core base diff --git a/tests/test_test.dsp b/tests/test_test.dsp index ff959c2..b4965b1 100644 --- a/tests/test_test.dsp +++ b/tests/test_test.dsp @@ -485,7 +485,7 @@ SOURCE=.\streams\fileback.cpp # End Source File # Begin Source File -SOURCE=.\fileconf\fileconftest.cpp +SOURCE=.\config\fileconf.cpp # End Source File # Begin Source File diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp index 8c3195d..f3ec4c7 100644 --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@ -435,6 +435,10 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File +SOURCE=.\config\config.cpp +# End Source File +# Begin Source File + SOURCE=.\dummy.cpp # ADD BASE CPP /Yc"testprec.h" # ADD CPP /Yc"testprec.h" -- 2.7.4