From: drh <drh@noemail.net>
Date: Tue, 31 Mar 2015 18:05:49 +0000 (+0000)
Subject: Add the "mptest" target to main.mk.  Change TRUNCATE and PERSIST to DELETE
X-Git-Tag: version-3.8.9~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c45196a76c92309980cdbd7fd570e183c272c36;p=thirdparty%2Fsqlite.git

Add the "mptest" target to main.mk.  Change TRUNCATE and PERSIST to DELETE
for mptest.c on Windows because of problems trying to delete the journal.

FossilOrigin-Name: ea697e6d9ff1f4d77774589a02ba4a18feafbf03
---

diff --git a/main.mk b/main.mk
index 7d21dbb25e..57bb35c486 100644
--- a/main.mk
+++ b/main.mk
@@ -408,6 +408,19 @@ mptester$(EXE):	sqlite3.c $(TOP)/mptest/mptest.c
 	$(TCCX) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \
 		$(TLIBS) $(THREADLIB)
 
+MPTEST1=./mptester$(EXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20
+MPTEST2=./mptester$(EXE) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20
+mptest:	mptester$(EXE)
+	rm -f mptest.db
+	$(MPTEST1) --journalmode DELETE
+	$(MPTEST2) --journalmode WAL
+	$(MPTEST1) --journalmode WAL
+	$(MPTEST2) --journalmode PERSIST
+	$(MPTEST1) --journalmode PERSIST
+	$(MPTEST2) --journalmode TRUNCATE
+	$(MPTEST1) --journalmode TRUNCATE
+	$(MPTEST2) --journalmode DELETE
+
 sqlite3.o:	sqlite3.c
 	$(TCCX) -I. -c sqlite3.c
 
diff --git a/manifest b/manifest
index d5d1701f1e..74afeab247 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\ssqlite3_log()\smessage\sgenerated\son\sa\sretry\safter\sdelay\sin\sos_win\nto\sbe\san\sSQLITE_NOTICE\sinstead\sof\sSQLITE_IOERR.
-D 2015-03-31T17:32:06.290
+C Add\sthe\s"mptest"\starget\sto\smain.mk.\s\sChange\sTRUNCATE\sand\sPERSIST\sto\sDELETE\nfor\smptest.c\son\sWindows\sbecause\sof\sproblems\strying\sto\sdelete\sthe\sjournal.
+D 2015-03-31T18:05:49.317
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -152,7 +152,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 04c49c495795b18a7b70053eef285be1e4d43fa4
+F main.mk 997eee18387a3e69394f2f948c9c6ccf079655a4
 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
 F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@ -160,7 +160,7 @@ F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
 F mptest/crash02.subtest f4ef05adcd15d60e5d2bd654204f2c008b519df8
-F mptest/mptest.c 4691e08e1fc114edd8e1875f88393718f70ba480
+F mptest/mptest.c dae6de83eddac3ef97fc4111632f6066760f939a
 F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@@ -1248,7 +1248,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3deff25249c59b7fc1b6eb65dda39736955679c6
-R 5464b14f38d360ccc6fa7360d378f7df
+P 5d533eee049e63b3700f5ef7c28c588afccde57a
+R 9e646d8c9c851fc471bfbde27cfe2ec7
 U drh
-Z f2a2061ec6a7f778916e1fed0b96d2ff
+Z 7401f8256f1a048a9f3296d27a2e41e1
diff --git a/manifest.uuid b/manifest.uuid
index 1069e22d85..9e31354eac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5d533eee049e63b3700f5ef7c28c588afccde57a
\ No newline at end of file
+ea697e6d9ff1f4d77774589a02ba4a18feafbf03
\ No newline at end of file
diff --git a/mptest/mptest.c b/mptest/mptest.c
index 1efdc0319a..52ff6a4c83 100644
--- a/mptest/mptest.c
+++ b/mptest/mptest.c
@@ -1327,6 +1327,17 @@ int SQLITE_CDECL main(int argc, char **argv){
   }
   rc = sqlite3_open_v2(g.zDbFile, &g.db, openFlags, g.zVfs);
   if( rc ) fatalError("cannot open [%s]", g.zDbFile);
+  if( zJMode ){
+#if defined(_WIN32)
+    if( sqlite3_stricmp(zJMode,"persist")==0
+     || sqlite3_stricmp(zJMode,"truncate")==0
+    ){
+      printf("Changing journal mode to DELETE from %s", zJMode);
+      zJMode = "DELETE";
+    }
+#endif
+    runSql("PRAGMA journal_mode=%Q;", zJMode);
+  }
   sqlite3_enable_load_extension(g.db, 1);
   sqlite3_busy_handler(g.db, busyHandler, 0);
   sqlite3_create_function(g.db, "vfsname", 0, SQLITE_UTF8, 0,
@@ -1358,7 +1369,6 @@ int SQLITE_CDECL main(int argc, char **argv){
       fatalError("missing script filename");
     }
     if( n>1 ) unrecognizedArguments(argv[0], n, argv+2);
-    if( zJMode ) runSql("PRAGMA journal_mode=%Q;", zJMode);
     runSql(
       "DROP TABLE IF EXISTS task;\n"
       "DROP TABLE IF EXISTS counters;\n"