remove TestTimer() (adds nothing to existing tests) and move wxStopWatch tests to...

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index f80181e48f7a5b3e799bb4ede21ba6df6888da16..ccd1364776df5c7e53e2e1a263932b61ce5b5bd1 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -131,10 +131,9 @@
     #define TEST_STACKWALKER
     #define TEST_STDPATHS
     #define TEST_STREAMS
-    #define TEST_TIMER
-//    #define TEST_VOLUME   --FIXME! (RN)
 #else // #if TEST_ALL
     #define TEST_DATETIME
+    #define TEST_VOLUME
 #endif
 
 // some tests are interactive, define this to run them
@@ -2827,113 +2826,6 @@ static void TestMemoryStream()
 
 #endif // TEST_STREAMS
 
-// ----------------------------------------------------------------------------
-// timers
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_TIMER
-
-#include "wx/stopwatch.h"
-#include "wx/utils.h"
-
-static void TestStopWatch()
-{
-    wxPuts(wxT("*** Testing wxStopWatch ***\n"));
-
-    wxStopWatch sw;
-    sw.Pause();
-    wxPrintf(wxT("Initially paused, after 2 seconds time is..."));
-    fflush(stdout);
-    wxSleep(2);
-    wxPrintf(wxT("\t%ldms\n"), sw.Time());
-
-    wxPrintf(wxT("Resuming stopwatch and sleeping 3 seconds..."));
-    fflush(stdout);
-    sw.Resume();
-    wxSleep(3);
-    wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());
-
-    sw.Pause();
-    wxPrintf(wxT("Pausing agan and sleeping 2 more seconds..."));
-    fflush(stdout);
-    wxSleep(2);
-    wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());
-
-    sw.Resume();
-    wxPrintf(wxT("Finally resuming and sleeping 2 more seconds..."));
-    fflush(stdout);
-    wxSleep(2);
-    wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());
-
-    wxStopWatch sw2;
-    wxPuts(wxT("\nChecking for 'backwards clock' bug..."));
-    for ( size_t n = 0; n < 70; n++ )
-    {
-        sw2.Start();
-
-        for ( size_t m = 0; m < 100000; m++ )
-        {
-            if ( sw.Time() < 0 || sw2.Time() < 0 )
-            {
-                wxPuts(wxT("\ntime is negative - ERROR!"));
-            }
-        }
-
-        wxPutchar('.');
-        fflush(stdout);
-    }
-
-    wxPuts(wxT(", ok."));
-}
-
-#include "wx/timer.h"
-#include "wx/evtloop.h"
-
-void TestTimer()
-{
-    wxPuts(wxT("*** Testing wxTimer ***\n"));
-
-    class MyTimer : public wxTimer
-    {
-    public:
-        MyTimer() : wxTimer() { m_num = 0; }
-
-        virtual void Notify()
-        {
-            wxPrintf(wxT("%d"), m_num++);
-            fflush(stdout);
-
-            if ( m_num == 10 )
-            {
-                wxPrintf(wxT("... exiting the event loop"));
-                Stop();
-
-                wxEventLoop::GetActive()->Exit(0);
-                wxPuts(wxT(", ok."));
-            }
-
-            fflush(stdout);
-        }
-
-    private:
-        int m_num;
-    };
-
-    wxEventLoop loop;
-
-    wxTimer timer1;
-    timer1.Start(100, true /* one shot */);
-    timer1.Stop();
-    timer1.Start(100, true /* one shot */);
-
-    MyTimer timer;
-    timer.Start(500);
-
-    loop.Run();
-}
-
-#endif // TEST_TIMER
-
 // ----------------------------------------------------------------------------
 // wxVolume tests
 // ----------------------------------------------------------------------------
@@ -3309,11 +3201,6 @@ int main(int argc, char **argv)
         TestMemoryStream();
 #endif // TEST_STREAMS
 
-#ifdef TEST_TIMER
-    TestStopWatch();
-    TestTimer();
-#endif // TEST_TIMER
-
 #ifdef TEST_DATETIME
     #if TEST_INTERACTIVE
         TestDateTimeInteractive();

diff --git a/tests/Makefile.in b/tests/Makefile.in
index df5ab92c41e6fd53acc732c853689db510ad5def..e5fd2ee4e682cdbddd23316c58c908a4ab3b25b3 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -65,6 +65,7 @@ TEST_OBJECTS =  \
        test_datetimetest.o \
        test_evthandler.o \
        test_evtsource.o \
+       test_stopwatch.o \
        test_timertest.o \
        test_exec.o \
        test_filetest.o \
@@ -389,6 +390,9 @@ test_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_ODEP)
 test_evtsource.o: $(srcdir)/events/evtsource.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evtsource.cpp
 
+test_stopwatch.o: $(srcdir)/events/stopwatch.cpp $(TEST_ODEP)
+       $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/stopwatch.cpp
+
 test_timertest.o: $(srcdir)/events/timertest.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/timertest.cpp
 

diff --git a/tests/events/stopwatch.cpp b/tests/events/stopwatch.cpp
new file mode 100644 (file)
index 0000000..d26566f
--- /dev/null
+++ b/tests/events/stopwatch.cpp
@@ -0,0 +1,95 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/events/stopwatch.cpp
+// Purpose:     Test wxStopWatch class
+// Author:      Francesco Montorsi (extracted from console sample)
+// Created:     2010-05-16
+// RCS-ID:      $Id$
+// Copyright:   (c) 2010 wxWidgets team
+///////////////////////////////////////////////////////////////////////////////
+
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif // WX_PRECOMP
+
+#include <time.h>
+
+#include "wx/stopwatch.h"
+#include "wx/utils.h"
+
+// --------------------------------------------------------------------------
+// test class
+// --------------------------------------------------------------------------
+
+class StopWatchTestCase : public CppUnit::TestCase
+{
+public:
+    StopWatchTestCase() {}
+
+private:
+    CPPUNIT_TEST_SUITE( StopWatchTestCase );
+        CPPUNIT_TEST( Misc );
+        CPPUNIT_TEST( BackwardsClockBug );
+    CPPUNIT_TEST_SUITE_END();
+
+    void Misc();
+    void BackwardsClockBug();
+
+    DECLARE_NO_COPY_CLASS(StopWatchTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( StopWatchTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StopWatchTestCase, "StopWatchTestCase" );
+
+void StopWatchTestCase::Misc()
+{
+    wxStopWatch sw;
+    long tmp;
+
+    sw.Pause();         // pause it immediately
+
+    wxSleep(2);
+    tmp = sw.Time();
+    CPPUNIT_ASSERT(tmp >= 0 && tmp < 100);
+            // should not have counted while paused!
+
+    sw.Resume();
+    wxSleep(3);
+    tmp = sw.Time();
+    CPPUNIT_ASSERT(tmp >= 3000 && tmp < 4000);
+
+    sw.Pause();
+    sw.Resume();
+
+    wxSleep(2);
+    tmp = sw.Time();
+    CPPUNIT_ASSERT(tmp >= 5000 && tmp < 6000);
+}
+
+void StopWatchTestCase::BackwardsClockBug()
+{
+    wxStopWatch sw;
+    wxStopWatch sw2;
+
+    for ( size_t n = 0; n < 10; n++ )
+    {
+        sw2.Start();
+
+        for ( size_t m = 0; m < 10000; m++ )
+        {
+            CPPUNIT_ASSERT ( sw.Time() >= 0 && sw2.Time() >= 0 );
+        }
+    }
+}

diff --git a/tests/events/timertest.cpp b/tests/events/timertest.cpp
index 48553a271a3dd84dda0c72f233cc5eeb4cde9363..56105d83fe89bd9986e8ae9dd148125547a3fb3e 100644 (file)
--- a/tests/events/timertest.cpp
+++ b/tests/events/timertest.cpp
@@ -25,7 +25,10 @@
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 
+// --------------------------------------------------------------------------
 // helper class counting the number of timer events
+// --------------------------------------------------------------------------
+
 class TimerCounterHandler : public wxEvtHandler
 {
 public:

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index bbad494156c86c6a0097bdf052d3497c990414a1..a079fb90597dea031dca8a202c209a9ab7f84879 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -49,6 +49,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_datetimetest.obj \\r
        $(OBJS)\test_evthandler.obj \\r
        $(OBJS)\test_evtsource.obj \\r
+       $(OBJS)\test_stopwatch.obj \\r
        $(OBJS)\test_timertest.obj \\r
        $(OBJS)\test_exec.obj \\r
        $(OBJS)\test_filetest.obj \\r
@@ -431,6 +432,9 @@ $(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
 $(OBJS)\test_evtsource.obj: .\events\evtsource.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp\r
 \r
+$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp\r
+\r
 $(OBJS)\test_timertest.obj: .\events\timertest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp\r
 \r

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index b250c6377bba5b9c27af30066ccbe20b988d2017..42d881e88e69f40f22dda5de216b1edb4f6f6d48 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -41,6 +41,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_datetimetest.o \\r
        $(OBJS)\test_evthandler.o \\r
        $(OBJS)\test_evtsource.o \\r
+       $(OBJS)\test_stopwatch.o \\r
        $(OBJS)\test_timertest.o \\r
        $(OBJS)\test_exec.o \\r
        $(OBJS)\test_filetest.o \\r
@@ -412,6 +413,9 @@ $(OBJS)\test_evthandler.o: ./events/evthandler.cpp
 $(OBJS)\test_evtsource.o: ./events/evtsource.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_stopwatch.o: ./events/stopwatch.cpp\r
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_timertest.o: ./events/timertest.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 237822026f04155f665c46cdd4b015aa216e23ff..cc32e910700d9a2036f098e338b5daaf2499c149 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -43,6 +43,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_datetimetest.obj \\r
        $(OBJS)\test_evthandler.obj \\r
        $(OBJS)\test_evtsource.obj \\r
+       $(OBJS)\test_stopwatch.obj \\r
        $(OBJS)\test_timertest.obj \\r
        $(OBJS)\test_exec.obj \\r
        $(OBJS)\test_filetest.obj \\r
@@ -557,6 +558,9 @@ $(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
 $(OBJS)\test_evtsource.obj: .\events\evtsource.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp\r
 \r
+$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp\r
+\r
 $(OBJS)\test_timertest.obj: .\events\timertest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp\r
 \r

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 7fca6b4ccb04f75cc5932aad767f6508f5352a90..67b82aead304dc362aab21ed9d911bd6d8bf64ab 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -279,6 +279,7 @@ TEST_OBJECTS =  &
        $(OBJS)\test_datetimetest.obj &\r
        $(OBJS)\test_evthandler.obj &\r
        $(OBJS)\test_evtsource.obj &\r
+       $(OBJS)\test_stopwatch.obj &\r
        $(OBJS)\test_timertest.obj &\r
        $(OBJS)\test_exec.obj &\r
        $(OBJS)\test_filetest.obj &\r
@@ -469,6 +470,9 @@ $(OBJS)\test_evthandler.obj :  .AUTODEPEND .\events\evthandler.cpp
 $(OBJS)\test_evtsource.obj :  .AUTODEPEND .\events\evtsource.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_stopwatch.obj :  .AUTODEPEND .\events\stopwatch.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_timertest.obj :  .AUTODEPEND .\events\timertest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r

diff --git a/tests/test.bkl b/tests/test.bkl
index 629d6049e81dbeb3acd53ada26afc9d16dcce989..3ce77af3afdfdce63b37131bdedb6493f6054369 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -40,6 +40,7 @@
             datetime/datetimetest.cpp
             events/evthandler.cpp
             events/evtsource.cpp
+            events/stopwatch.cpp
             events/timertest.cpp
             exec/exec.cpp
             file/filetest.cpp

diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index 271690fa8b871d16ab7d4c3d9f415832eb23d0f4..981800bbbc5185722fcfdf977d4fb99e99f4c326 100644 (file)
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -429,6 +429,10 @@ SOURCE=.\strings\stdstrings.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\events\stopwatch.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\strings\strings.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 874d981a3517ec9a5b98efba90012ee3505e4537..284639384dbc853cfad8293ee22724aa83c977e7 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -757,6 +757,9 @@
                        <File\r
                                RelativePath=".\strings\stdstrings.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\events\stopwatch.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\strings.cpp">\r
                        </File>\r

diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index 7254ddcb877fce2c043458ff00b1f30f29f98c8c..8215eacc9ff4a003b57ea0f26d19cd8853c76959 100644 (file)
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -1083,6 +1083,10 @@
                                RelativePath=".\strings\stdstrings.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\events\stopwatch.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\strings.cpp"\r
                                >\r

diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index 071b74f23ae6c73b9ffe9ff3064568cde5840637..2b48c4b5d23791b4f1688c6bc7a1893b67780aa0 100644 (file)
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
+<!--\r
+\r
+  This project was generated by\r
+  Bakefile 0.2.8 (http://www.bakefile.org)\r
+  Do not modify, all changes will be overwritten!\r
+\r
+-->\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="test"\r
        ProjectGUID="{2F45723C-ED6B-5F60-8BFF-6B3609464A7B}"\r
-       TargetFrameworkVersion="0"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -12,6 +18,7 @@
                />\r
        </Platforms>\r
        <ToolFiles>\r
+               \r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
@@ -44,7 +51,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;F:\cppunit\include"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -79,7 +86,7 @@
                                OutputFile="vc_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib;F:\cppunit\lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswud\test.pdb"\r
@@ -97,8 +104,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswud\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -178,9 +185,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
+                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -193,8 +200,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswu\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -289,8 +296,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswunivud\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -370,9 +377,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="1"\r
+                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -385,8 +392,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswunivu\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -481,8 +488,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswuddll\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -562,9 +569,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
+                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -577,8 +584,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswudll\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -673,8 +680,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswunivuddll\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -754,9 +761,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
+                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -769,8 +776,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               SuppressStartupBanner="true"\r
                                OutputFile="vc_mswunivudll\test_vc9_test.bsc"\r
+                               SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -784,6 +791,7 @@
                </Configuration>\r
        </Configurations>\r
        <References>\r
+               \r
        </References>\r
        <Files>\r
                <Filter\r
@@ -1047,6 +1055,10 @@
                                RelativePath=".\strings\stdstrings.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\events\stopwatch.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\strings.cpp"\r
                                >\r
@@ -1142,5 +1154,7 @@
                </Filter>\r
        </Files>\r
        <Globals>\r
+               \r
        </Globals>\r
 </VisualStudioProject>\r
+\r