From 1a86d2e52c76551a8067403bc08d82bee0186d2c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 25 May 2008 02:56:22 +0000 Subject: [PATCH] create tests/window directory for wxWindow tests git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/Makefile.in | 10 +++++----- tests/makefile.bcc | 10 +++++----- tests/makefile.gcc | 10 +++++----- tests/makefile.vc | 10 +++++----- tests/makefile.wat | 10 +++++----- tests/test.bkl | 2 +- tests/test_test_gui.dsp | 2 +- tests/test_vc7_test_gui.vcproj | 2 +- tests/test_vc8_test_gui.vcproj | 2 +- tests/{controls => window}/clientsize.cpp | 0 10 files changed, 29 insertions(+), 29 deletions(-) rename tests/{controls => window}/clientsize.cpp (100%) diff --git a/tests/Makefile.in b/tests/Makefile.in index 562680c0f7..48b14a96e7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -116,9 +116,9 @@ TEST_GUI_OBJECTS = \ test_gui_size.o \ test_gui_point.o \ test_gui_config.o \ - test_gui_clientsize.o \ test_gui_textctrltest.o \ - test_gui_selstoretest.o + test_gui_selstoretest.o \ + test_gui_clientsize.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) \ @@ -501,15 +501,15 @@ test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP) test_gui_config.o: $(srcdir)/config/config.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/config/config.cpp -test_gui_clientsize.o: $(srcdir)/controls/clientsize.cpp $(TEST_GUI_ODEP) - $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/clientsize.cpp - test_gui_textctrltest.o: $(srcdir)/controls/textctrltest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/textctrltest.cpp test_gui_selstoretest.o: $(srcdir)/misc/selstoretest.cpp $(TEST_GUI_ODEP) $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/selstoretest.cpp +test_gui_clientsize.o: $(srcdir)/window/clientsize.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/window/clientsize.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 ee35fe01e1..2edcdf71d9 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -103,9 +103,9 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_size.obj \ $(OBJS)\test_gui_point.obj \ $(OBJS)\test_gui_config.obj \ - $(OBJS)\test_gui_clientsize.obj \ $(OBJS)\test_gui_textctrltest.obj \ - $(OBJS)\test_gui_selstoretest.obj + $(OBJS)\test_gui_selstoretest.obj \ + $(OBJS)\test_gui_clientsize.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) \ @@ -536,15 +536,15 @@ $(OBJS)\test_gui_point.obj: .\geometry\point.cpp $(OBJS)\test_gui_config.obj: .\config\config.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp -$(OBJS)\test_gui_clientsize.obj: .\controls\clientsize.cpp - $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\clientsize.cpp - $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp $(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp +$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp + $(OBJS)\printfbench_dummy.obj: .\dummy.cpp $(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H .\dummy.cpp diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 49dd117b90..7bf1140190 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -96,9 +96,9 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_size.o \ $(OBJS)\test_gui_point.o \ $(OBJS)\test_gui_config.o \ - $(OBJS)\test_gui_clientsize.o \ $(OBJS)\test_gui_textctrltest.o \ - $(OBJS)\test_gui_selstoretest.o + $(OBJS)\test_gui_selstoretest.o \ + $(OBJS)\test_gui_clientsize.o PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -514,15 +514,15 @@ $(OBJS)\test_gui_point.o: ./geometry/point.cpp $(OBJS)\test_gui_config.o: ./config/config.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\test_gui_clientsize.o: ./controls/clientsize.cpp - $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\test_gui_textctrltest.o: ./controls/textctrltest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\test_gui_selstoretest.o: ./misc/selstoretest.cpp $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\test_gui_clientsize.o: ./window/clientsize.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 ada13d91f5..4a238a3295 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -99,9 +99,9 @@ TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_size.obj \ $(OBJS)\test_gui_point.obj \ $(OBJS)\test_gui_config.obj \ - $(OBJS)\test_gui_clientsize.obj \ $(OBJS)\test_gui_textctrltest.obj \ - $(OBJS)\test_gui_selstoretest.obj + $(OBJS)\test_gui_selstoretest.obj \ + $(OBJS)\test_gui_clientsize.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) \ @@ -621,15 +621,15 @@ $(OBJS)\test_gui_point.obj: .\geometry\point.cpp $(OBJS)\test_gui_config.obj: .\config\config.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp -$(OBJS)\test_gui_clientsize.obj: .\controls\clientsize.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\clientsize.cpp - $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp $(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp +$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp + $(OBJS)\printfbench_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) /Yctestprec.h .\dummy.cpp diff --git a/tests/makefile.wat b/tests/makefile.wat index f17975db60..4da93dc9fc 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -308,9 +308,9 @@ TEST_GUI_OBJECTS = & $(OBJS)\test_gui_size.obj & $(OBJS)\test_gui_point.obj & $(OBJS)\test_gui_config.obj & - $(OBJS)\test_gui_clientsize.obj & $(OBJS)\test_gui_textctrltest.obj & - $(OBJS)\test_gui_selstoretest.obj + $(OBJS)\test_gui_selstoretest.obj & + $(OBJS)\test_gui_clientsize.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) & @@ -567,15 +567,15 @@ $(OBJS)\test_gui_point.obj : .AUTODEPEND .\geometry\point.cpp $(OBJS)\test_gui_config.obj : .AUTODEPEND .\config\config.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< -$(OBJS)\test_gui_clientsize.obj : .AUTODEPEND .\controls\clientsize.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< - $(OBJS)\test_gui_textctrltest.obj : .AUTODEPEND .\controls\textctrltest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(OBJS)\test_gui_selstoretest.obj : .AUTODEPEND .\misc\selstoretest.cpp $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< +$(OBJS)\test_gui_clientsize.obj : .AUTODEPEND .\window\clientsize.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 4d3d5caa3c..b8b0475dc9 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -95,9 +95,9 @@ geometry/size.cpp geometry/point.cpp config/config.cpp - controls/clientsize.cpp controls/textctrltest.cpp misc/selstoretest.cpp + window/clientsize.cpp core base diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp index a7dc53936e..ee5b74aea4 100644 --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@ -235,7 +235,7 @@ LINK32=link.exe # PROP Default_Filter "" # Begin Source File -SOURCE=.\controls\clientsize.cpp +SOURCE=.\window\clientsize.cpp # End Source File # Begin Source File diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj index 48f2e35941..2a750e3879 100644 --- a/tests/test_vc7_test_gui.vcproj +++ b/tests/test_vc7_test_gui.vcproj @@ -650,7 +650,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"> + RelativePath=".\window\clientsize.cpp"/>