From cdd7606f024ac08557265fc8ea55b38a0cd832bc Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 20 May 2016 22:38:18 +0200
Subject: [PATCH] fixing the password saving test.

---
 src/kernel/save.test.c | 16 ++++++++++------
 src/util/log.test.c    |  1 +
 vs2015-build.bat       |  2 ++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c
index de7f28084..070ee878e 100644
--- a/src/kernel/save.test.c
+++ b/src/kernel/save.test.c
@@ -231,21 +231,25 @@ static void test_read_password_external(CuTest *tc) {
     CuAssertPtrNotNull(tc, f->_password);
     data = gamedata_open(path, "wb");
     CuAssertPtrNotNull(tc, data);
-    WRITE_TOK(data->store, (const char *)f->_password);
-    WRITE_TOK(data->store, (const char *)f->_password);
+    WRITE_TOK(data->store, "newpassword");
+    WRITE_TOK(data->store, "secret");
+    WRITE_TOK(data->store, "$brokenhash");
     gamedata_close(data);
     data = gamedata_open(path, "rb");
     CuAssertPtrNotNull(tc, data);
+    data->version = NOCRYPT_VERSION;
+    _test_read_password(data, f);
+    CuAssertStrEquals(tc, "newpassword", f->_password);
     data->version = BADCRYPT_VERSION;
     _test_read_password(data, f);
-    CuAssertPtrEquals(tc, 0, f->_password);
+    CuAssertStrEquals(tc, "secret", f->_password);
     F = fopen(pwfile, "wt");
-    fprintf(F, "%s:secret\n", itoa36(f->no));
+    fprintf(F, "%s:pwfile\n", itoa36(f->no));
     fclose(F);
     _test_read_password(data, f);
-    CuAssertPtrNotNull(tc, f->_password);
+    CuAssertStrEquals(tc, "pwfile", f->_password);
+    CuAssertTrue(tc, checkpasswd(f, "pwfile"));
     gamedata_close(data);
-    CuAssertTrue(tc, checkpasswd(f, "secret"));
     CuAssertIntEquals(tc, 0, remove(path));
     CuAssertIntEquals(tc, 0, remove(pwfile));
 }
diff --git a/src/util/log.test.c b/src/util/log.test.c
index 017481e48..9c0e8bb73 100644
--- a/src/util/log.test.c
+++ b/src/util/log.test.c
@@ -1,3 +1,4 @@
+#include <platform.h>
 #include <CuTest.h>
 
 #include "log.h"
diff --git a/vs2015-build.bat b/vs2015-build.bat
index 82f1f4cd6..6c39659d1 100644
--- a/vs2015-build.bat
+++ b/vs2015-build.bat
@@ -5,7 +5,9 @@ CD ..
 SET ERESSEA=%CD%
 
 CD %SRCDIR%
+IF exist build-vs%VSVERSION% goto HAVEDIR
 mkdir build-vs%VSVERSION%
+:HAVEDIR
 cd build-vs%VSVERSION%
 "%ProgramFiles(x86)%\CMake\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%ProgramFiles(x86)%/Lua/5.1;%ERESSEA%/dependencies-win32" -DCMAKE_MODULE_PATH="%SRCDIR%/cmake/Modules" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
 PAUSE