From 6da477d37f8646dbd33d2c817a5f6d4799722e96 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Sun, 23 Sep 2018 12:37:23 +0300 Subject: [PATCH] mdbx-ci: backport - refines for Windows (squashed). - push logs to appveyor separately. - rename 'test.exe' to 'mdbx_test.exe'. - add test.db to appveyor artefacts (windows). --- appveyor.yml | 18 ++++++++++-------- test/test.vcxproj | 4 ++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 98ac34bd..3b0660ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,21 +32,23 @@ build_script: test_script: - ps: | - if (($env:PLATFORM -eq "x86") -and (Test-Path "C:\projects\libmdbx\Win32\$env:CONFIGURATION\test.exe" -PathType Leaf)) { - $test = "C:\projects\libmdbx\Win32\$env:CONFIGURATION\test.exe" + if (($env:PLATFORM -eq "x86") -and (Test-Path "C:\projects\libmdbx\Win32\$env:CONFIGURATION\mdbx_test.exe" -PathType Leaf)) { + $mdbx_test = "C:\projects\libmdbx\Win32\$env:CONFIGURATION\mdbx_test.exe" $mdbx_chk = "C:\projects\libmdbx\Win32\$env:CONFIGURATION\mdbx_chk.exe" } elseif (($env:PLATFORM -ne "ARM") -and ($env:PLATFORM -ne "ARM64")) { - $test = "C:\projects\libmdbx\$env:PLATFORM\$env:CONFIGURATION\test.exe" + $mdbx_test = "C:\projects\libmdbx\$env:PLATFORM\$env:CONFIGURATION\mdbx_test.exe" $mdbx_chk = "C:\projects\libmdbx\$env:PLATFORM\$env:CONFIGURATION\mdbx_chk.exe" } else { - $test = "" + $mdbx_test = "" $mdbx_chk = "" } - if ($test -ne "") { - & "$test" --pathname=tmp.db --dont-cleanup-after basic | Tee-Object -file test.log | Select-Object -last 42 - & "$mdbx_chk" -nvv tmp.db | Tee-Object -file chk.log | Select-Object -last 42 + if ($mdbx_test -ne "") { + & "$mdbx_test" --pathname=test.db --dont-cleanup-after basic | Tee-Object -file test.log | Select-Object -last 42 + & "$mdbx_chk" -nvv test.db | Tee-Object -file chk.log | Select-Object -last 42 } on_failure: -- ps: Push-AppveyorArtifact test.log chk.log +- ps: Push-AppveyorArtifact test.log +- ps: Push-AppveyorArtifact test.db +- ps: Push-AppveyorArtifact chk.log diff --git a/test/test.vcxproj b/test/test.vcxproj index 3ee13cf8..a8c21d38 100644 --- a/test/test.vcxproj +++ b/test/test.vcxproj @@ -78,21 +78,25 @@ true $(SolutionDir)$(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + mdbx_test false $(SolutionDir)$(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + mdbx_test true $(SolutionDir)$(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + mdbx_test false $(SolutionDir)$(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\ + mdbx_test