/ Check-in [cc9d9a12]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Updates for Windows.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | experimental
Files: files | file ages | folders
SHA1: cc9d9a12c3b19320b0ecfa78a6cee3d668004988
User & Date: shaneh 2010-11-04 20:46:09
Context
2010-11-04
20:47
Fix icon size so it's really 32x32. check-in: 62c494f6 user: shaneh tags: experimental
20:46
Updates for Windows. check-in: cc9d9a12 user: shaneh tags: experimental
04:47
Include the print_pager_state() function only if SQLITE_DEBUG is defined. check-in: 3104f17e user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/attachmalloc.test.

22
23
24
25
26
27
28
29
30

31
32
33
34
35
36
37
..
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
  finish_test
  return
}

source $testdir/malloc_common.tcl

do_malloc_test attachmalloc-1 -tclprep {
  db close
  for {set i 2} {$i<=4} {incr i} {

    file delete -force test$i.db
    file delete -force test$i.db-journal
  }
} -tclbody {
  if {[catch {sqlite3 db test.db}]} {
    error "out of memory"
  }
................................................................................
  db2 close
} -sqlbody {
  CREATE TABLE t1(d, e, f);
  ATTACH 'test2.db' AS db1;
}

set enable_shared_cache [sqlite3_enable_shared_cache 1]
sqlite3 dbaux test2.db
dbaux eval {SELECT * FROM sqlite_master}
do_malloc_test attachmalloc-3 -sqlbody {
  SELECT * FROM sqlite_master;
  ATTACH 'test2.db' AS two;
} -cleanup {
  db eval { DETACH two }
}
dbaux close
sqlite3_enable_shared_cache $enable_shared_cache


finish_test







|

>







 







|



|

|






22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
..
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
  finish_test
  return
}

source $testdir/malloc_common.tcl

do_malloc_test attachmalloc-1 -tclprep {
  catch { db close }
  for {set i 2} {$i<=4} {incr i} {
    catch { db$i close }
    file delete -force test$i.db
    file delete -force test$i.db-journal
  }
} -tclbody {
  if {[catch {sqlite3 db test.db}]} {
    error "out of memory"
  }
................................................................................
  db2 close
} -sqlbody {
  CREATE TABLE t1(d, e, f);
  ATTACH 'test2.db' AS db1;
}

set enable_shared_cache [sqlite3_enable_shared_cache 1]
sqlite3 dbaux test3.db
dbaux eval {SELECT * FROM sqlite_master}
do_malloc_test attachmalloc-3 -sqlbody {
  SELECT * FROM sqlite_master;
  ATTACH 'test3.db' AS three;
} -cleanup {
  db eval { DETACH three }
}
dbaux close
sqlite3_enable_shared_cache $enable_shared_cache


finish_test

Changes to test/permutations.test.

767
768
769
770
771
772
773



774


775
776

777
778
779
780
781
782
783
  set ::G(perm:name)         $name
  set ::G(perm:prefix)       $options(-prefix)
  set ::G(perm:presql)       $options(-presql)
  set ::G(isquick)           1

  uplevel $options(-initialize)




  foreach file [lsort $options(-files)] {


    if {[file tail $file] == $file} { set file [file join $::testdir $file] }
    slave_test_file $file

  }

  uplevel $options(-shutdown)

  unset ::G(perm:name)
  unset ::G(perm:prefix)
  unset ::G(perm:presql)







>
>
>

>
>
|
|
>







767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
  set ::G(perm:name)         $name
  set ::G(perm:prefix)       $options(-prefix)
  set ::G(perm:presql)       $options(-presql)
  set ::G(isquick)           1

  uplevel $options(-initialize)

  # uncomment stuff here to skip to a particular test
  set skip_to_file "pagerfault.test"
  set skip 1
  foreach file [lsort $options(-files)] {
    if {[file tail $file] == $skip_to_file} { set skip 0 }
    if {$skip == 0} {
      if {[file tail $file] == $file} { set file [file join $::testdir $file] }
      slave_test_file $file
    }
  }

  uplevel $options(-shutdown)

  unset ::G(perm:name)
  unset ::G(perm:prefix)
  unset ::G(perm:presql)