From: mistachkin <mistachkin@noemail.net>
Date: Wed, 7 Mar 2018 21:13:49 +0000 (+0000)
Subject: Enable compilation of 'sessionfuzz' tool using MSVC.
X-Git-Tag: version-3.23.0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98cb7a489424aa1a8849de40f3d25a9d26675f53;p=thirdparty%2Fsqlite.git

Enable compilation of 'sessionfuzz' tool using MSVC.

FossilOrigin-Name: c58de43b8f2723d659fc9820caf667e215fdfa9aa2d7337fc82ba5b6f8db2e4c
---

diff --git a/Makefile.msc b/Makefile.msc
index daedea2945..efb99085b6 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1708,6 +1708,9 @@ fuzzcheck.exe:	$(FUZZCHECK_SRC) $(SQLITE3C) $(SQLITE3H)
 ossshell.exe:	$(OSSSHELL_SRC) $(SQLITE3C) $(SQLITE3H)
 	$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
 
+sessionfuzz.exe:	zlib $(TOP)\test\sessionfuzz.c $(SQLITE3C) $(SQLITE3H)
+	$(LTLINK) $(NO_WARN) -I$(ZLIBINCDIR) $(TOP)\test\sessionfuzz.c /link $(LDFLAGS) $(LTLINKOPTS) /LIBPATH:$(ZLIBLIBDIR) $(ZLIBLIB)
+
 mptester.exe:	$(TOP)\mptest\mptest.c $(SQLITE3C) $(SQLITE3H)
 	$(LTLINK) $(NO_WARN) $(MPTESTER_COMPILE_OPTS) $(TOP)\mptest\mptest.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
 
diff --git a/manifest b/manifest
index 340c35486e..ea00f944ce 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,10 @@
-C Add\sthe\ssessionfuzz\stest\sprogram\sand\sdata\sobtained\sfrom\sa\sweek\sof\srunning\nAFL.\s\sAutomatically\srun\sthis\stest\sprogram\son\sany\s"make\stest"\son\sunix.
-D 2018-03-07T20:48:21.666
+C Enable\scompilation\sof\s'sessionfuzz'\stool\susing\sMSVC.
+D 2018-03-07T21:13:49.693
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 9d5201ef7e4f575d94ec6cd8a29a40ec3e4e150a01903afad385ccde72b30759
+F Makefile.msc 07126468817b997702c049d78522c4cd48405e2a4961f6822b4103925d61934a
 F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
 F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1216,7 +1216,7 @@ F test/selectG.test 089f7d3d7e6db91566f00b036cb353107a2cca6220eb1cb264085a836dae
 F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
 F test/sessionfuzz-data1.db 1f8d5def831f19b1c74571037f0d53a588ea49a6c4ca2a028fc0c27ef896dbcb
-F test/sessionfuzz.c 8167652afa13b6363825151c44ebcad9c993651e84537be94ec58e5004823f3d
+F test/sessionfuzz.c e23de0749df7d100aae33c1c3e371eaad2a1a1dab316f4ed62f73b2b0497e487
 F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
 F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
 F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
@@ -1712,7 +1712,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 36fec7a4a75006d860aaf3ea6707cea25c5e16f2ac05c21c27fde80f3bfeec63
-R e9b5633f22c17863b715b8220bf589aa
-U drh
-Z 0dea7c28192df29380ebcdd90caa6963
+P ecaedfe596d4c05546bfd798fdca94aff6a81f55be7b17ddb65fc5547c4b5aa6
+R b75a518c9fa7503c62c63e3b78fba859
+U mistachkin
+Z d724806c5b56199e78b36c783819acb6
diff --git a/manifest.uuid b/manifest.uuid
index 2cbb84b4ca..98bc1d6fcb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ecaedfe596d4c05546bfd798fdca94aff6a81f55be7b17ddb65fc5547c4b5aa6
\ No newline at end of file
+c58de43b8f2723d659fc9820caf667e215fdfa9aa2d7337fc82ba5b6f8db2e4c
\ No newline at end of file
diff --git a/test/sessionfuzz.c b/test/sessionfuzz.c
index 7a23b12343..0a97750b16 100644
--- a/test/sessionfuzz.c
+++ b/test/sessionfuzz.c
@@ -50,6 +50,14 @@
 /*
 ** We will import the entire SQLite source file to make compiling easier
 */
+#ifdef SQLITE_DEBUG
+#undef SQLITE_DEBUG
+#endif
+
+#ifdef SQLITE_THREADSAFE
+#undef SQLITE_THREADSAFE
+#endif
+
 #define SQLITE_DEBUG 1
 #define SQLITE_THREADSAFE 0
 #define SQLITE_OMIT_LOAD_EXTENSION 0
@@ -802,7 +810,7 @@ static void readFile(const char *zName, void **ppData, int *pnData){
   }
   nRead = fread(pBuf, 1, nIn, in);
   fclose(in);
-  if( nRead!=nIn ){
+  if( nRead!=(size_t)nIn ){
     fprintf(stderr, "Read only %d of %d bytes from %s\n", (int)nRead, (int)nIn,
                     zName);
     exit(1);