diff --git a/Code/Mantid/API/API.vcproj b/Code/Mantid/API/API.vcproj index 3a10e0f35eb28b256bce62e307a473237abd33e5..5cd93741a72ceb9842e598028176cb6942e87700 100644 --- a/Code/Mantid/API/API.vcproj +++ b/Code/Mantid/API/API.vcproj @@ -215,6 +215,10 @@ RelativePath=".\src\Sample.cpp" > </File> + <File + RelativePath=".\src\SpectraDetectorMap.cpp" + > + </File> <File RelativePath=".\src\Workspace.cpp" > @@ -353,6 +357,10 @@ RelativePath=".\test\SampleTest.h" > </File> + <File + RelativePath=".\inc\MantidAPI\SpectraDetectorMap.h" + > + </File> <File RelativePath=".\inc\MantidAPI\Workspace.h" > diff --git a/Code/Mantid/API/inc/MantidAPI/SpectraDetectorMap.h b/Code/Mantid/API/inc/MantidAPI/SpectraDetectorMap.h index 0b580562d7dfb66731107df66d2c5613046f95af..5aae2a88c02690bf0dea7376ea3f29dd960909fa 100644 --- a/Code/Mantid/API/inc/MantidAPI/SpectraDetectorMap.h +++ b/Code/Mantid/API/inc/MantidAPI/SpectraDetectorMap.h @@ -1,6 +1,7 @@ #ifndef SPECTRADETECTORMAP_ #define SPECTRADETECTORMAP_ +#include "MantidKernel/System.h" #ifdef _WIN32 #include <map> #else diff --git a/Code/Mantid/Kernel/test/runTests.bat b/Code/Mantid/Kernel/test/runTests.bat index cca8710132c45cc2f6d79108d604c2747a6c29f6..7471d862d08a2a6767d23d280945ae1e3e549442 100644 --- a/Code/Mantid/Kernel/test/runTests.bat +++ b/Code/Mantid/Kernel/test/runTests.bat @@ -30,8 +30,27 @@ link /OUT:"runner.exe" /NOLOGO /LIBPATH:"../../Debug" /LIBPATH:"../../../Third_P echo "Copying in properties files..." copy /Y ..\..\Build\Tests\*properties echo "Running the tests..." + +SETLOCAL ENABLEEXTENSIONS +:: Store start time +FOR /f "tokens=1-4 delims=:.," %%T IN ("%TIME%") DO ( +SET StartTIME=%TIME% +SET /a Start100S=%%T*360000+%%U*6000+%%V*100+%%W +) + runner.exe +:: Retrieve Stop time +FOR /f "tokens=1-4 delims=:.," %%T IN ("%TIME%") DO ( +SET StopTIME=%TIME% +SET /a Stop100S=%%T*360000+%%U*6000+%%V*100+%%W +) +:: Test midnight rollover. If so, add 1 day=8640000 1/100ths secs +IF %Stop100S% LSS %Start100S% SET /a Stop100S+=8640000 +SET /a TookTime=%Stop100S%-%Start100S% + +ECHO Elapsed: %TookTime:~0,-2%.%TookTime:~-2% seconds + REM Remove the generated files to ensure that they're not inadvertently run REM when something in the chain has failed. echo "Cleaning up..."