Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add the "warning" command to the TCL test infrastructure. Fix problems with the loadext.test module. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
514adbbd8cf3e296f55e8f803bddaac8 |
| User & Date: | drh 2013-04-19 12:32:52 |
Context
|
2013-04-22
| ||
| 02:39 | Use transitivity to move constraints into the outer loops of a join whenever possible, thereby reducing the amount of work that needs to occur in inner loops. check-in: 5f4907e1 user: drh tags: trunk | |
|
2013-04-19
| ||
| 12:32 | Add the "warning" command to the TCL test infrastructure. Fix problems with the loadext.test module. check-in: 514adbbd user: drh tags: trunk | |
| 02:47 | Enhance the extension loading mechanism so that the same source code can be used for run-time loadable extensions and statically linked extensions, and to mask architectural differences in shared libraries. check-in: a85b6ece user: drh tags: trunk | |
Changes
Changes to test/loadext.test.
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
...
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
#
do_test loadext-2.1 {
forcedelete ${testextension}xx
set rc [catch {
sqlite3_load_extension db "${testextension}xx"
} msg]
list $rc $msg
} [list 1 [format $dlerror_nosuchfile ${testextension}xx]]
# Try to load an extension for which the file is not a shared object
#
do_test loadext-2.2 {
set fd [open "${testextension}xx" w]
puts $fd blah
close $fd
set rc [catch {
sqlite3_load_extension db "${testextension}xx"
} msg]
set expected_error_pattern [format $dlerror_notadll ${testextension}xx]
list $rc [string match $expected_error_pattern $msg]
} [list 1 1]
# Try to load an extension for which the file is present but the
# entry point is not.
#
do_test loadext-2.3 {
set rc [catch {
sqlite3_load_extension db $testextension icecream
................................................................................
set res [catchsql {
SELECT load_extension($::testextension)
}]
if {$::tcl_platform(os) eq "Darwin"} {
regsub {0x[1234567890abcdefABCDEF]*} $res XXX res
}
set res
} [list 1 [format $dlerror_nosymbol $testextension sqlite3_extension_init]]
do_test loadext-3.3 {
catchsql {
SELECT load_extension($::testextension,'testloadext_init')
}
} {0 {{}}}
do_test loadext-3.4 {
catchsql {
|
|
|
>
>
>
|
<
<
|
>
|
|
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
...
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
#
do_test loadext-2.1 {
forcedelete ${testextension}xx
set rc [catch {
sqlite3_load_extension db "${testextension}xx"
} msg]
list $rc $msg
} /[list 1 [format $dlerror_nosuchfile ${testextension}xx.*]]/
# Try to load an extension for which the file is not a shared object
#
do_test loadext-2.2 {
set fd [open "./notasharedlib.so" w]
puts $fd blah
close $fd
set fd [open "./notasharedlib.dll" w]
puts $fd blah
close $fd
set rc [catch {
sqlite3_load_extension db "./notasharedlib"
} msg]
list $rc $msg
} /[list 1 [format $dlerror_notadll ./notasharedlib.*]]/
# Try to load an extension for which the file is present but the
# entry point is not.
#
do_test loadext-2.3 {
set rc [catch {
sqlite3_load_extension db $testextension icecream
................................................................................
set res [catchsql {
SELECT load_extension($::testextension)
}]
if {$::tcl_platform(os) eq "Darwin"} {
regsub {0x[1234567890abcdefABCDEF]*} $res XXX res
}
set res
} /[list 1 [format $dlerror_nosymbol $testextension sqlite3_.*_init]]/
do_test loadext-3.3 {
catchsql {
SELECT load_extension($::testextension,'testloadext_init')
}
} {0 {{}}}
do_test loadext-3.4 {
catchsql {
|
Changes to test/tester.tcl.
458 459 460 461 462 463 464 465 466 467 468 469 470 471 ... 491 492 493 494 495 496 497 498 499 500 501 502 503 504 ... 779 780 781 782 783 784 785 786 787 788 789 790 791 792 |
# counters in the parent interpreter.
#
if {0==[info exists ::SLAVE]} {
set TC(errors) 0
set TC(count) 0
set TC(fail_list) [list]
set TC(omit_list) [list]
proc set_test_counter {counter args} {
if {[llength $args]} {
set ::TC($counter) [lindex $args 0]
}
set ::TC($counter)
}
................................................................................
set nFail [set_test_counter errors]
if {$nFail>=$::cmdlinearg(maxerror)} {
puts "*** Giving up..."
finalize_testing
}
}
# Increment the number of tests run
#
proc incr_ntest {} {
set_test_counter count [expr [set_test_counter count] + 1]
}
................................................................................
sqlite3_soft_heap_limit 0
set nTest [incr_ntest]
set nErr [set_test_counter errors]
puts "$nErr errors out of $nTest tests"
if {$nErr>0} {
puts "Failures on these tests: [set_test_counter fail_list]"
}
run_thread_tests 1
if {[llength $omitList]>0} {
puts "Omitted test cases:"
set prec {}
foreach {rec} [lsort $omitList] {
if {$rec==$prec} continue
|
> > > > > > > > > > > > > > > > |
458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 ... 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 ... 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 |
# counters in the parent interpreter.
#
if {0==[info exists ::SLAVE]} {
set TC(errors) 0
set TC(count) 0
set TC(fail_list) [list]
set TC(omit_list) [list]
set TC(warn_list) [list]
proc set_test_counter {counter args} {
if {[llength $args]} {
set ::TC($counter) [lindex $args 0]
}
set ::TC($counter)
}
................................................................................
set nFail [set_test_counter errors]
if {$nFail>=$::cmdlinearg(maxerror)} {
puts "*** Giving up..."
finalize_testing
}
}
# Remember a warning message to be displayed at the conclusion of all testing
#
proc warning {msg {append 1}} {
puts "Warning: $msg"
set warnList [set_test_counter warn_list]
if {$append} {
lappend warnList $msg
}
set_test_counter warn_list $warnList
}
# Increment the number of tests run
#
proc incr_ntest {} {
set_test_counter count [expr [set_test_counter count] + 1]
}
................................................................................
sqlite3_soft_heap_limit 0
set nTest [incr_ntest]
set nErr [set_test_counter errors]
puts "$nErr errors out of $nTest tests"
if {$nErr>0} {
puts "Failures on these tests: [set_test_counter fail_list]"
}
foreach warning [set_test_counter warn_list] {
puts "Warning: $warning"
}
run_thread_tests 1
if {[llength $omitList]>0} {
puts "Omitted test cases:"
set prec {}
foreach {rec} [lsort $omitList] {
if {$rec==$prec} continue
|