upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 23:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcproj: Fix WML_test execution on debug builds

Browse Source 
[skip ci]
This commit is contained in:
aquileia 2015-03-08 19:29:17 +01:00
parent 44ec27daf2
commit 4da8eecc64
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
projectfiles/VC9/WML_tests.cmd
View File

@ -5,11 +5,10 @@
setlocal enabledelayedexpansion
:: save file paths and command line arguments
set LoadFile=%~p0..\..\wml_test_schedule
set binary=wesnoth.exe
cd ..\..\
set LoadFile=wml_test_schedule
set binary=%~f1%wesnoth.exe
set opt=--log-strict=warning
:: executable path can be set for VC debug configuration, defaults to wesnoth\
if "%1"=="" ( cd ..\..\ ) else ( cd %~p1 )
echo running WML tests:
set tSTART=%time%
@ -36,8 +35,12 @@ for /f "eol=# tokens=1,2 delims= " %%G in (%LoadFile%) do (
)
echo(
if not DEFINED fail_num ( set "fail_num=none" )
set /a "minutes = (1%time:~3,2%-100) - (1%tSTART:~3,2%-100)"
set /a "seconds = (1%time:~6,2%-100) - (1%tSTART:~6,2%-100)"
set /a "minutes = 1%time:~3,2% - 1%tSTART:~3,2%"
set /a "seconds = 1%time:~6,2% - 1%tSTART:~6,2%"
if %seconds% LSS 0 (
set /a "seconds+=60"
set /a "minutes-=1"
)
echo %test_num% WML tests completed in %minutes%m %seconds%s, %fail_num% of them failed
:: restore the state before execution

2
projectfiles/VC9/WindowsTimeout.cpp
View File

@ -20,11 +20,11 @@
*/
#if _WIN32_WINNT < 0x0602 //Windows version before Win8
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <Processthreadsapi.h>
#endif
// #define WIN32_LEAN_AND_MEAN
#include <stdlib.h>
#include <iostream>

14
projectfiles/VC9/WindowsTimeout.vcproj
View File

@ -18,8 +18,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\WindowsTimeout"
OutputDirectory="$(SolutionDir)\..\.."
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@ -88,7 +88,7 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)\..\.."
IntermediateDirectory="$(ConfigurationName)\WindowsTimeout"
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@ -157,8 +157,8 @@
</Configuration>
<Configuration
Name="Debug_with_VLD|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\WindowsTimeout"
OutputDirectory="$(SolutionDir)\..\.."
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
>
@ -225,8 +225,8 @@
</Configuration>
<Configuration
Name="ReleaseDEBUG|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\WindowsTimeout"
OutputDirectory="$(SolutionDir)\..\.."
IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"