From dbf232b8f890e49b466146441f052b78c1a8a7bc Mon Sep 17 00:00:00 2001
From: AeroXuk <AeroXuk@users.noreply.github.com>
Date: Sun, 19 Nov 2017 13:35:08 +0000
Subject: [PATCH] Fix bugs in AppVeyor config and build script. Added call to
 test script.

---
 .appveyor.yml | 5 +----
 win_build.bat | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index dca32bb7..59702dd3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,11 +16,8 @@ environment:
     MSYSTEM: MINGW64
     BIT: 64
 
-install:
-  -'%APPVEYOR_BUILD_FOLDER%\win_install.bat'
-
 build_script:
   - '%APPVEYOR_BUILD_FOLDER%\win_build.bat'
 
 test_script:
-  - 'echo No tests yet'
+  - '%APPVEYOR_BUILD_FOLDER%\test\test_libpostal.exe'
diff --git a/win_build.bat b/win_build.bat
index 743015ba..f8f1b7b5 100644
--- a/win_build.bat
+++ b/win_build.bat
@@ -14,8 +14,9 @@ IF %COMPILER%==msys2 (
   @echo on
   SET "PATH=C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%"
 
-  bash -lc "cd $APPVEYOR_BUILD_FOLDER && . bootstrap.sh"
-  bash -lc "cd $APPVEYOR_BUILD_FOLDER && . configure --datadir=$APPVEYOR_BUILD_FOLDER/data"
+  bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp -rf windows/* ./"
+  bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh"
+  bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --datadir=/c"
   bash -lc "cd $APPVEYOR_BUILD_FOLDER && make"
   bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install"
 )