Index: Tests/common.eagle ================================================================== --- Tests/common.eagle +++ Tests/common.eagle @@ -1220,10 +1220,16 @@ # the SQLiteLog class being able to setup its logging callback). # Normally, this should only be performed if SQLite is loaded and # ready for use by the test suite. # if {$force || [isSQLiteReady]} then { + # + # BUGFIX: Before calling the native shutdown function, make sure both + # of the PRAGMA related directory names are freed. + # + checkForSQLiteDirectories $channel true + if {[catch {object invoke -flags +NonPublic \ System.Data.SQLite.UnsafeNativeMethods \ sqlite3_shutdown} result] == 0} then { if {!$quiet} then { tputs $channel [appendArgs \ @@ -1700,10 +1706,16 @@ # tputs $::test_channel [appendArgs \ "---- System.Data.SQLite tests ended at " \ [clock format [clock seconds]] \n] + # + # BUGFIX: Before checking the final resources in use by SQLite, make + # sure both of the PRAGMA related directory names are freed. + # + checkForSQLiteDirectories $::test_channel true + # # NOTE: Also report the resource usage after running the tests. # reportSQLiteResources $::test_channel } Index: Tests/thread.eagle ================================================================== --- Tests/thread.eagle +++ Tests/thread.eagle @@ -88,15 +88,16 @@ INSERT INTO t1 (y) VALUES(RANDOMBLOB(${count(4)})); INSERT INTO t1 (y) VALUES(RANDOMBLOB(${count(4)})); }] # - # NOTE: The temporary directory must be reset here because it allocates - # some SQLite memory and this test requires an extremely accurate - # reading. + # NOTE: The data and temporary directories must be reset here (after the + # setupDb call above) because they allocate some SQLite memory and + # this test requires an extremely accurate reading. # sql execute $db { + PRAGMA data_store_directory = ""; PRAGMA temp_store_directory = ""; } # # NOTE: Close the database now, freeing any native SQLite memory and/or Index: Tests/tkt-bb4b04d457.eagle ================================================================== --- Tests/tkt-bb4b04d457.eagle +++ Tests/tkt-bb4b04d457.eagle @@ -18,11 +18,11 @@ package require System.Data.SQLite.Test runSQLiteTestPrologue ############################################################################### -runTest {test tkt-bb4b04d457-1.1 {} -setup { +runTest {test tkt-bb4b04d457-1.1 {TIMESTAMP column with Ticks} -setup { setupDb [set fileName tkt-bb4b04d457-1.1.db] "" Ticks Utc } -body { set dateTime [object invoke -alias DateTime Parse 2011-11-29T12:34:56Z] set dateTime [$dateTime -alias ToUniversalTime]