[proteowizard-commit] SF.net SVN: proteowizard:[1655] trunk/pwiz/pwiz_tools

[<bre...@us...>]

Revision: 1655
          http://proteowizard.svn.sourceforge.net/proteowizard/?rev=1655&view=rev
Author:   brendanx
Date:     2009-12-30 20:00:56 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Fix Skyline and Topograph unit tests to register as tests and not break the build on TC, per Matt's instructions.

Modified Paths:
--------------
    trunk/pwiz/pwiz_tools/Skyline/Jamfile.jam
    trunk/pwiz/pwiz_tools/Topograph/Jamfile.jam

Modified: trunk/pwiz/pwiz_tools/Skyline/Jamfile.jam
===================================================================
--- trunk/pwiz/pwiz_tools/Skyline/Jamfile.jam	2009-12-30 16:03:57 UTC (rev 1654)
+++ trunk/pwiz/pwiz_tools/Skyline/Jamfile.jam	2009-12-30 20:00:56 UTC (rev 1655)
@@ -70,8 +70,11 @@
         IF "_%ProgramFiles%_" EQU "__" set ProgramFiles="C:\Program Files"
         IF EXIST "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" CALL "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 >nul
         echo Unit testing Skyline in $(CONFIGURATION:L) configuration...
+        set name="Skyline unit test"
+        $(TEST_PRECOMMAND)
         msbuild $(SKYLINE_PATH)/Skyline.sln /p:Configuration=$(CONFIGURATION);OutDir=$(OUTPUT_PATH) /t:Test /nologo /verbosity:minimal
         msbuild $(SKYLINE_PATH)/Skyline.test.proj /p:SolutionDir=$(SKYLINE_PATH);OutDir=$(OUTPUT_PATH);TestProject=Test /nologo /verbosity:minimal
+        $(TEST_POSTCOMMAND)
     }
     
     rule do_skyline_test_functional ( targets + : sources * : properties * )
@@ -84,8 +87,11 @@
         IF "_%ProgramFiles%_" EQU "__" set ProgramFiles="C:\Program Files"
         IF EXIST "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" CALL "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 >nul
         echo Functional testing Skyline in $(CONFIGURATION:L) configuration...
+        set name="Skyline functional test"
+        $(TEST_PRECOMMAND)
         msbuild $(SKYLINE_PATH)/Skyline.sln /p:Configuration=$(CONFIGURATION);OutDir=$(OUTPUT_PATH) /t:TestFunctional /nologo /verbosity:minimal
         msbuild $(SKYLINE_PATH)/Skyline.test.proj /p:SolutionDir=$(SKYLINE_PATH);OutDir=$(OUTPUT_PATH);TestProject=TestFunctional /nologo /verbosity:minimal
+        $(TEST_POSTCOMMAND)
     }
     
     rule do_skyline_test_passed ( targets + : sources * : properties * )

Modified: trunk/pwiz/pwiz_tools/Topograph/Jamfile.jam
===================================================================
--- trunk/pwiz/pwiz_tools/Topograph/Jamfile.jam	2009-12-30 16:03:57 UTC (rev 1654)
+++ trunk/pwiz/pwiz_tools/Topograph/Jamfile.jam	2009-12-30 20:00:56 UTC (rev 1655)
@@ -114,8 +114,11 @@
         IF "_%ProgramFiles%_" EQU "__" set ProgramFiles="C:\Program Files"
         IF EXIST "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" CALL "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 >nul
         echo Unit testing Topograph in $(CONFIGURATION:L) configuration...
+        set name="Topograph unit test"
+        $(TEST_PRECOMMAND)
         msbuild $(TOPOGRAPH_PATH)/turnover.sln /p:Configuration=$(CONFIGURATION);OutDir=$(OUTPUT_PATH) /t:TopographTestProject /nologo /verbosity:minimal
         msbuild $(TOPOGRAPH_PATH)/Topograph.test.proj /p:SolutionDir=$(TOPOGRAPH_PATH);OutDir=$(OUTPUT_PATH);TestProject=TopographTestProject /nologo /verbosity:minimal
+        $(TEST_POSTCOMMAND)
     }
 
     rule do_topograph_test_passed ( targets + : sources * : properties * )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.