james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

windows fixes for selftest

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-10 14:36:16 +01:00
parent 966fe2387c
commit 6123f65158
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Makefile.am
+1 -1
View File
@@ -26,4 +26,4 @@
TESTS = basic.sh TESTS = basic.sh
AM_TESTS_ENVIRONMENT = export VERSION=$(VERSION); AM_TESTS_ENVIRONMENT = export VERSION=$(VERSION); export EXEEXT=$(EXEEXT);
tests/basic.sh
+3 -3
View File
@@ -31,11 +31,11 @@
set -e set -e
HELP_OUTPUT=$(../yubico-piv-tool --help) HELP_OUTPUT=$(../yubico-piv-tool$EXEEXT --help)
expected="yubico-piv-tool $VERSION" expected="yubico-piv-tool $VERSION"
VERSION_OUTPUT=$(../yubico-piv-tool --version) VERSION_OUTPUT=$(../yubico-piv-tool$EXEEXT --version | sed 's/\r//')
if [ "x$VERSION_OUTPUT" != "x$expected" ]; then if [ "x$VERSION_OUTPUT" != "x$expected" ]; then
echo "Version not matching expected output $expected." echo "Version ($VERSION_OUTPUT) not matching expected output $expected."
exit 1 exit 1
fi fi
windows.mk
+2 -2
View File
@@ -61,7 +61,7 @@ doit:
zip -r ../../$(PACKAGE)-$(VERSION)-win$(ARCH).zip * zip -r ../../$(PACKAGE)-$(VERSION)-win$(ARCH).zip *
32bit: 32bit:
$(MAKE) -f windows.mk doit ARCH=32 HOST=i686-w64-mingw32 $(MAKE) -f windows.mk doit ARCH=32 HOST=i686-w64-mingw32 CHECK=CHECK
64bit: 64bit:
$(MAKE) -f windows.mk doit ARCH=64 HOST=x86_64-w64-mingw32 $(MAKE) -f windows.mk doit ARCH=64 HOST=x86_64-w64-mingw32 CHECK=CHECK