From 5787f07617d729ff0c4b6fd90e107b9f88a604f9 Mon Sep 17 00:00:00 2001 From: Oleg Moiseenko <807634+merlokk@users.noreply.github.com> Date: Fri, 19 Jun 2020 16:56:48 +0300 Subject: [PATCH] Appveyour cmake (#805) appveyour cmake --- appveyor.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e166d9694..240724d80 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -236,26 +236,21 @@ build_script: bash -c -i 'make clean' - #Write-Host "---------- cmake ----------" -ForegroundColor Yellow + Write-Host "---------- cmake ----------" -ForegroundColor Yellow - #$TestTime=[System.Environment]::TickCount + $TestTime=[System.Environment]::TickCount - #$script='C:\ProxSpace\msys2\msys2_shell.cmd -mingw32 -defterm -no-start -c "mkdir -p client/build; cd client/build; pwd; cmake -G`"MSYS Makefiles`" ..; ls; make VERBOSE=1;"' + cmd.exe /c 'C:\ProxSpace\msys2\msys2_shell.cmd -mingw32 -defterm -no-start -c "mkdir -p client/build; cd client/build; cmake -G""MSYS Makefiles"" ..; make VERBOSE=1;"' - #$script="$script" + Write-Host "---------- cmake tests ----------" -ForegroundColor Yellow - #$scriptblk=[scriptblock]::Create("$script") - - #$res=&$scriptblk + cd c:\ProxSpace\pm3 + bash -c -i './tools/pm3_tests.sh --clientbin client/build/proxmark3.exe client' - #Write-Host "---------- make ok ----------" -ForegroundColor Yellow + $testspass = ($LASTEXITCODE -eq 0) - #bash -c -i 'make check CHECKARGS="--clientbin ./client/build/proxmark3"' - - #$testspass = ($LASTEXITCODE -eq 0) - - #$global:TestsPassed=(($global:TestsPassed) -and ($testspass)) + $global:TestsPassed=(($global:TestsPassed) -and ($testspass)) if ($testspass) { Add-AppveyorTest -Name "cmake Tests" -Framework NUnit -Filename "make client/check" -Outcome Passed -Duration "$([System.Environment]::TickCount-$TestTime)"