Get the mptest program running on windows.

FossilOrigin-Name: 3966b33284355325afda627ed6f4e26f967438f8
This commit is contained in:
drh 2013-04-06 14:04:22 +00:00
parent 3f5bc38037
commit f012ae0759
3 changed files with 30 additions and 8 deletions

View File

@ -1,5 +1,5 @@
C Many\simprovements\sto\sthe\smptest\sprogram.\s\sAdded\sa\ssimple\stest\sscript.
D 2013-04-06T13:09:11.141
C Get\sthe\smptest\sprogram\srunning\son\swindows.
D 2013-04-06T14:04:22.154
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in aafa71d66bab7e87fb2f348152340645f79f0244
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -111,7 +111,7 @@ F mkopcodec.awk f6fccee29e68493bfd90a2e0466ede5fa94dd2fc
F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
F mptest/config01.test 058a9bc2b0db710d36003ab06dc1618566f27b52
F mptest/mptest.c d73b294c354719f33086d8d3ebc273553b26073c
F mptest/mptest.c 7dcc7afacc87be958c181f36a8494ef145ebd131
F mptest/multiwrite01.test aef0af17f1ce1beacd158e403a45a21008d7a70c
F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@ -1047,7 +1047,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P c318fafe686120d7fb8e487eb3bb4942d497665c
R e5c361902695f1e216fb1ed024ee2204
P 07b0401a9b61b1664fc6dcddac3b5969fc0f481a
R 61768559c8a66440452ca26012ff3963
U drh
Z 1a794dfe7c097a8f7d97d3bcdba2a731
Z 2d9f9bfb3324d80756ef1485b1717ef9

View File

@ -1 +1 @@
07b0401a9b61b1664fc6dcddac3b5969fc0f481a
3966b33284355325afda627ed6f4e26f967438f8

View File

@ -22,6 +22,7 @@
** Recommended options:
**
** -DHAVE_USLEEP
** -DSQLITE_MAX_SCHEMA_RETRY=100
** -DSQLITE_NO_SYNC
** -DSQLITE_THREADSAFE=0
** -DSQLITE_OMIT_LOAD_EXTENSION
@ -542,14 +543,35 @@ static int finishScript(int iClient, int taskId, int bShutdown){
static void startClient(int iClient){
runSql("INSERT OR IGNORE INTO client VALUES(%d,0)", iClient);
if( sqlite3_changes(g.db) ){
#if defined(__unix__)
char *zSys;
zSys = sqlite3_mprintf(
"%s \"%s\" --client %d --trace %d %s&",
g.argv0, g.zDbFile, iClient, g.iTrace,
g.bSqlTrace ? "--sqltrace " : "");
system(zSys);
sqlite3_free(zSys);
#endif
#if defined(_WIN32)
char *argv[10];
char zClient[20];
char zTrace[20];
argv[0] = g.argv0;
argv[1] = g.zDbFile;
argv[2] = "--client";
sqlite3_snprintf(sizeof(zClient),zClient,"%d",iClient);
argv[3] = zClient;
argv[4] = "--trace";
sqlite3_snprintf(sizeof(zTrace),zTrace,"%d",g.iTrace);
argv[5] = zTrace;
if( g.bSqlTrace ){
argv[6] = "--sqltrace";
argv[7] = 0;
}else{
argv[6] = 0;
}
_spawnv(_P_NOWAIT, g.argv0, argv);
#endif
}
}