From: Klas Lindfors <klas@yubico.com>
Date: Thu, 20 Sep 2012 09:22:21 +0000 (+0200)
Subject: more fixing
X-Git-Tag: v1.8.0~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8523c6fbec7a30bef5ae68401857e602c6f1f3ff;p=yubikey-personalization

more fixing
---

diff --git a/.travis.yml b/.travis.yml
index b19361a..bbcee64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,15 @@ compiler:
 env:
   - LIBUSB=libusb EXTRA=libusb-dev
   - LIBUSB=libusb-1.0 EXTRA=libusb-1.0-0-dev
-  - LIBUSB=win32 EXTRA=wine mingw-w64
-  - LIBUSB=win64 EXTRA=wine mingw-w64
-script: ./build-and-test
+  - LIBUSB=win32 EXTRA=mingw-w64
+  - LIBUSB=win64 EXTRA=mingw-w64
+script: ./build-and-test.sh
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libyubikey-dev $EXTRA
 matrix:
   exclude:
     - compiler: clang
-      env: LIBUSB=win32
+      env: LIBUSB=win32 EXTRA=mingw-w64
     - compiler: clang
-      env: LIBUSB=win64
+      env: LIBUSB=win64 EXTRA=mingw-w64