From: drh <drh@noemail.net>
Date: Tue, 31 Mar 2015 18:18:53 +0000 (+0000)
Subject: Path portability enhancements for mptester.exe.
X-Git-Tag: version-3.8.10~122^2~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c32ed7a5867fb50e43009e960ba88c93e8fad83;p=thirdparty%2Fsqlite.git

Path portability enhancements for mptester.exe.

FossilOrigin-Name: c8694657bdc5d0917d8fe78fd3937d8e9cd9d04b
---

2c32ed7a5867fb50e43009e960ba88c93e8fad83
diff --cc manifest
index 74afeab247,c8faf609ad..f1aa496dd8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- 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
 -C Path\shandling\sportability\senhancements\sfor\smptester.
 -D 2015-03-31T17:58:13.315
++C Path\sportability\senhancements\sfor\smptester.exe.
++D 2015-03-31T18:18:53.022
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -160,7 -160,7 +160,7 @@@ F mptest/config01.test 3c6adcbc50b99186
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
  F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
  F mptest/crash02.subtest f4ef05adcd15d60e5d2bd654204f2c008b519df8
- F mptest/mptest.c dae6de83eddac3ef97fc4111632f6066760f939a
 -F mptest/mptest.c d1e8ff5488bda5ff51407d6e86b4f6e8de7ff443
++F mptest/mptest.c fca59f0a922e03f95ed17c44b1515ed37a841c81
  F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@@@ -1248,7 -1248,7 +1248,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5d533eee049e63b3700f5ef7c28c588afccde57a
- R 9e646d8c9c851fc471bfbde27cfe2ec7
 -P 9cc70eee2e365dd390210f436b893b9d80a19b04
 -R be2bc38a728d3b9a8c390950640aab4e
 -U mistachkin
 -Z 01af2fb4ec1ab808dcf4522c94181a8f
++P ea697e6d9ff1f4d77774589a02ba4a18feafbf03 da49634b331812fa4d6e33d72c9661aeab203ae8
++R 126147c160c4bad0e1b7fe3417e6316b
++T +closed da49634b331812fa4d6e33d72c9661aeab203ae8
 +U drh
- Z 7401f8256f1a048a9f3296d27a2e41e1
++Z 3bf817d5b936af30f76c04f3a5290142
diff --cc manifest.uuid
index 9e31354eac,eb12a9de38..012d207f50
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ea697e6d9ff1f4d77774589a02ba4a18feafbf03
 -da49634b331812fa4d6e33d72c9661aeab203ae8
++c8694657bdc5d0917d8fe78fd3937d8e9cd9d04b
diff --cc mptest/mptest.c
index 52ff6a4c83,366375424b..f81ffb5ca0
--- a/mptest/mptest.c
+++ b/mptest/mptest.c
@@@ -1327,17 -1334,6 +1334,18 @@@ int SQLITE_CDECL main(int argc, char **
    }
    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);
 +  }
++  if( !g.bSync ) trySql("PRAGMA synchronous=OFF");
    sqlite3_enable_load_extension(g.db, 1);
    sqlite3_busy_handler(g.db, busyHandler, 0);
    sqlite3_create_function(g.db, "vfsname", 0, SQLITE_UTF8, 0,