diff --git a/libsql-ffi/bundled/src/sqlite3.c b/libsql-ffi/bundled/src/sqlite3.c index c56470a6ed..3fc5d60a58 100644 --- a/libsql-ffi/bundled/src/sqlite3.c +++ b/libsql-ffi/bundled/src/sqlite3.c @@ -69646,10 +69646,6 @@ static int sqlite3WalCheckpoint( rc = walBusyLock(pWal, xBusy2, pBusyArg, WAL_WRITE_LOCK, 1); if( rc==SQLITE_OK ){ pWal->writeLock = 1; - }else if( rc==SQLITE_BUSY ){ - eMode2 = SQLITE_CHECKPOINT_PASSIVE; - xBusy2 = 0; - rc = SQLITE_OK; } } } diff --git a/libsql-sqlite3/src/wal.c b/libsql-sqlite3/src/wal.c index 1220b66a93..162c171317 100644 --- a/libsql-sqlite3/src/wal.c +++ b/libsql-sqlite3/src/wal.c @@ -4133,10 +4133,6 @@ static int sqlite3WalCheckpoint( rc = walBusyLock(pWal, xBusy2, pBusyArg, WAL_WRITE_LOCK, 1); if( rc==SQLITE_OK ){ pWal->writeLock = 1; - }else if( rc==SQLITE_BUSY ){ - eMode2 = SQLITE_CHECKPOINT_PASSIVE; - xBusy2 = 0; - rc = SQLITE_OK; } } } diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 9655624f3c..8fa18c0598 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -76,7 +76,7 @@ fn build_wasm(_arg: &str) -> Result<()> { fn run_tests(arg: &str) -> Result<()> { println!("installing nextest"); - run_cargo(&["install", "cargo-nextest"])?; + install_nextest()?; println!("running nextest run"); run_cargo(&["nextest", "run", arg])?; @@ -85,7 +85,7 @@ fn run_tests(arg: &str) -> Result<()> { fn run_tests_encryption(arg: &str) -> Result<()> { println!("installing nextest"); - run_cargo(&["install", "--force", "cargo-nextest"])?; + install_nextest()?; println!("running nextest run"); run_cargo(&[ "nextest", @@ -167,3 +167,13 @@ fn run_cp(cmd: &[&str]) -> Result<()> { Ok(()) } + +fn install_nextest() -> Result<()> { + run_cargo(&[ + "install", + "--force", + "cargo-nextest@0.9.88", + "--no-default-features", + ])?; + Ok(()) +}