Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AppVeyor のテストタブを利用します。 #580

Merged
merged 1 commit into from
Nov 11, 2018
Merged

AppVeyor のテストタブを利用します。 #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/run-tests.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ set platform=%1
set configuration=%2
set ERROR_RESULT=0

set FILTER_BAT=%~dp0test_result_filter_tell_AppVeyor.bat

pushd %~dp0
set BUILDDIR=build\%platform%
set BINARY_DIR=%BUILDDIR%\bin\%configuration%
Expand All @@ -12,8 +14,8 @@ for /r %%i in (tests*.exe) do (
@echo %%i --gtest_list_tests
%%i --gtest_list_tests || set ERROR_RESULT=1

@echo %%i
%%i || set ERROR_RESULT=1
@echo %%i | "%FILTER_BAT%"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

パイプをエスケープしていないからエコーメッセージがフィルタに流れていた。影響はパイプ以降のメッセージが表示されないことだけ。

%%i | "%FILTER_BAT%" || set ERROR_RESULT=1
)
popd
popd
Expand Down
53 changes: 53 additions & 0 deletions tests/test_result_filter_tell_AppVeyor.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
@echo off
setlocal ENABLEDELAYEDEXPANSION

set NL=^


::: Blank lines above are parts of the NL (New Line) definition. Do not compact them.

::: About `appveyor` command line program:
::: https://www.appveyor.com/docs/build-worker-api/
set AppVeyor=appveyor
where /Q "%AppVeyor%"
if errorlevel 1 (
ds14050 marked this conversation as resolved.
Show resolved Hide resolved
echo>&2 %~nx0: `%AppVeyor%` command was not found. This filter does nothing effective.
set AppVeyor=
ds14050 marked this conversation as resolved.
Show resolved Hide resolved
)

set fileName=
set testName=
set testMsg=
::: for each line read from stdin.
for /F "usebackq delims=" %%L in (`FINDSTR /B "^"`) do (
echo %%L

if not "%AppVeyor%" == "" (
for /F "tokens=1,2,3,5 delims=[]() " %%A in ("%%L") do (
if "%%A" == "----------" (
if not "%%D" == "" (
set fileName=%%D
)
) else if "%%A" == "RUN" (
set testName=%%B
set testMsg=
) else if "%%A" == "OK" (
if not "!testName!,!fileName!" == "," (
rem `start` does not wait for `%AppVeyor%` to return, so the main loop goes immediately.
start "" "%AppVeyor%" AddTest !testName! -Framework xUnit -FileName !fileName! -Outcome Passed -Duration %%C -StdOut "!testMsg!"
k-takata marked this conversation as resolved.
Show resolved Hide resolved
)
) else if "%%A" == "FAILED" (
if not "!testName!,!fileName!" == "," (
rem `start` does not wait for `%AppVeyor%` to return, so the main loop goes immediately.
start "" "%AppVeyor%" AddTest !testName! -Framework xUnit -FileName !fileName! -Outcome Failed -Duration %%C -ErrorMessage "!testMsg!"
)
) else if "%%A" == "PASSED" (
rem
) else if "%%A" == "==========" (
rem
) else (
set testMsg=!testMsg!%%L!NL!
)
)
)
)