windows fixes for selftest

2014-02-10 14:36:16 +01:00
parent 966fe2387c
commit 6123f65158
3 changed files with 6 additions and 6 deletions
@@ -31,11 +31,11 @@

 set -e

-HELP_OUTPUT=$(../yubico-piv-tool --help)
+HELP_OUTPUT=$(../yubico-piv-tool$EXEEXT --help)

 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
-  echo "Version not matching expected output $expected."
+  echo "Version ($VERSION_OUTPUT) not matching expected output $expected."
  exit 1
 fi