From 67ff9f73fa5d6010d4206f96289a8ad7ae3c9b62 Mon Sep 17 00:00:00 2001 From: philsmd Date: Fri, 26 Jan 2018 07:52:37 +0100 Subject: [PATCH] appveyor: use just 'make' instead of 'make install' (which is not supported on windows) --- .appveyor.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 507fdb244..ec92e71a4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,6 @@ environment: CYG_MIRROR: http://cygwin.mirror.constant.com CYG_PACKAGES: make,gcc-core,libiconv-devel - DOCUMENT_FOLDER: /share/doc/hashcat matrix: - CYG_ROOT: C:\cygwin64 CYG_CACHE: C:\cygwin64\var\cache\setup @@ -15,12 +14,10 @@ environment: CC: gcc - MSYSTEM: MINGW64 MSYS_CACHE: C:\msys64\var\cache\pacman\pkg - KERNEL_CACHE: C:\msys64\usr\local\bin\OpenCL\ BASH: C:\msys64\usr\bin\bash CC: gcc - MSYSTEM: MINGW32 MSYS_CACHE: C:\msys64\var\cache\pacman\pkg - KERNEL_CACHE: C:\msys64\usr\local\bin\OpenCL\ BASH: C:\msys64\usr\bin\bash CC: gcc @@ -42,23 +39,20 @@ install: - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm") build_script: - - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule update --init && make install") + - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule update --init && make") test_script: # some file globbing tests # 1. hash file should not exist and therefore hashcat should complain (if it does not there might be a problem) # 2. hash file should expand to example0.hash and succeed - ps: >- - if (Test-Path Env:\MSYSTEM) - { - mkdir $env:KERNEL_CACHE 2>&1 | out-null - } + cd $env:APPVEYOR_BUILD_FOLDER - & $env:BASH -lc "hashcat.exe -m 0 --show $env:DOCUMENT_FOLDER/*file_not_found.hash" 2>&1 | out-null + & $env:BASH -c "./hashcat.exe -m 0 --show *file_not_found.hash" 2>&1 | out-null if ($LastExitCode -eq 0) { throw "test failed" } - & $env:BASH -lc "hashcat.exe -m 0 --show $env:DOCUMENT_FOLDER/*ple0.hash" + & $env:BASH -c "./hashcat.exe -m 0 --show *ple0.hash"