diff options
| author | dan <dan@noemail.net> | 2015-03-17 16:01:29 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-03-17 16:01:29 +0000 |
| commit | 363fc9e724d1597ef58ad699e6667917355f921d (patch) | |
| tree | 7cb1ad48bf6eb533509bba0ec0981a9ae7468883 /src/test_vfs.c | |
| parent | bbf76eec342f7a4732b7e38329b6ea1ac8c682da (diff) | |
| download | sqlite-363fc9e724d1597ef58ad699e6667917355f921d.tar.gz sqlite-363fc9e724d1597ef58ad699e6667917355f921d.zip | |
Add a test for the change on this branch.
FossilOrigin-Name: e22dde187eb0b389d6d93e2e39a26fd0f4e6196e
Diffstat (limited to 'src/test_vfs.c')
| -rw-r--r-- | src/test_vfs.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/test_vfs.c b/src/test_vfs.c index 561addfcc..2277cf7eb 100644 --- a/src/test_vfs.c +++ b/src/test_vfs.c @@ -967,16 +967,15 @@ static void tvfsShmBarrier(sqlite3_file *pFile){ TestvfsFd *pFd = tvfsGetFd(pFile); Testvfs *p = (Testvfs *)(pFd->pVfs->pAppData); + if( p->pScript && p->mask&TESTVFS_SHMBARRIER_MASK ){ + const char *z = pFd->pShm ? pFd->pShm->zFile : ""; + tvfsExecTcl(p, "xShmBarrier", Tcl_NewStringObj(z, -1), pFd->pShmId, 0, 0); + } + if( p->isFullshm ){ sqlite3OsShmBarrier(pFd->pReal); return; } - - if( p->pScript && p->mask&TESTVFS_SHMBARRIER_MASK ){ - tvfsExecTcl(p, "xShmBarrier", - Tcl_NewStringObj(pFd->pShm->zFile, -1), pFd->pShmId, 0, 0 - ); - } } static int tvfsShmUnmap( @@ -1532,7 +1531,7 @@ static int testvfs_cmd( return TCL_OK; bad_args: - Tcl_WrongNumArgs(interp, 1, objv, "VFSNAME ?-noshm BOOL? ?-default BOOL? ?-mxpathname INT? ?-szosfile INT? ?-iversion INT?"); + Tcl_WrongNumArgs(interp, 1, objv, "VFSNAME ?-noshm BOOL? ?-fullshm BOOL? ?-default BOOL? ?-mxpathname INT? ?-szosfile INT? ?-iversion INT?"); return TCL_ERROR; } |