mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem in loadext.test causing an error on OSX. This is not a real problem, just a case of the test script expecting a slightly different error message than the one returned. (CVS 6361)

Browse Source 
FossilOrigin-Name: 18680989b5365b0e35fadca5919dfced22433ff4
This commit is contained in:
danielk1977 2009-03-20 09:09:37 +00:00
parent 238746a650
commit eefa000331
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\scouple\sof\sfairly\sobscure\scases\swhere\san\sassert()\scould\sfail\sfollowing\sa\smalloc\sfailure.\s(CVS\s6360)
D 2009-03-19T18:51:07
C Fix\sa\sproblem\sin\sloadext.test\scausing\san\serror\son\sOSX.\sThis\sis\snot\sa\sreal\sproblem,\sjust\sa\scase\sof\sthe\stest\sscript\sexpecting\sa\sslightly\sdifferent\serror\smessage\sthan\sthe\sone\sreturned.\s(CVS\s6361)
D 2009-03-20T09:09:37
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -427,7 +427,7 @@ F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
F test/like.test 22f7857f9d7da7ff5061ded8806c43a6271109fc
F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e
F test/loadext.test 18db29c081380fdedcfbd8c633847712059ae104
F test/loadext.test 0393ce12d9616aa87597dd0ec88181de181f6db0
F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
F test/lock.test 9c06ddc3a094a78ed7e49d15165b3fc458bcbfc7
F test/lock2.test d4f941d1f659e5fc782b4912b1a872d77d4b5470
@ -709,7 +709,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P e8be1af922098e298902820730f8b28603bd6fae
R a5b48358dfad70bb132127a0cacc5d78
P cc0d925669ddeb55048e88aa5b4f658be60b0962
R c2b4f8dc2ed503f7f98d2a8993a8e276
U danielk1977
Z ab897999fdfbec1ae24894bf472e0325
Z 17fd67756579ad71d085631289576f09

2
manifest.uuid
View File

@ -1 +1 @@
cc0d925669ddeb55048e88aa5b4f658be60b0962
18680989b5365b0e35fadca5919dfced22433ff4

18
test/loadext.test
View File

@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this script is extension loading.
#
# $Id: loadext.test,v 1.16 2008/10/13 17:09:11 drh Exp $
# $Id: loadext.test,v 1.17 2009/03/20 09:09:37 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@ -62,8 +62,7 @@ set dlerror_nosymbol {%s: undefined symbol: %s}
if {$::tcl_platform(os) eq "Darwin"} {
set dlerror_nosuchfile {dlopen(%s, 10): image not found}
set dlerror_notadll {dlopen(%1$s, 10): no suitable image found. Did find:
%1$s: file to short}
set dlerror_notadll {dlopen(%1$s, 10): no suitable image found.*}
set dlerror_nosymbol {dlsym(XXX, %2$s): symbol not found}
}
@ -74,9 +73,11 @@ if {$::tcl_platform(os) eq "Darwin"} {
if {![file exists $testextension]} {
set srcdir [file dir $testdir]/src
set testextsrc $srcdir/test_loadext.c
if {[catch {
exec gcc {*}[set gcc_shared] -Wall -I$srcdir -I. -g $testextsrc -o $testextension
} msg]} {
set cmdline [concat exec gcc $gcc_shared]
lappend cmdline -Wall -I$srcdir -I. -g $testextsrc -o $testextension
if {[catch $cmdline msg]} {
puts "Skipping loadext tests: Test extension not built..."
puts $msg
finish_test
@ -149,8 +150,9 @@ do_test loadext-2.2 {
set rc [catch {
sqlite3_load_extension db "${testextension}xx"
} msg]
list $rc $msg
} [list 1 [format $dlerror_notadll ${testextension}xx]]
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.