From e7c8a5c75d9dd8b67a4f1cdc2e954e28076df656 Mon Sep 17 00:00:00 2001 From: pweilbacher Date: Fri, 22 Aug 2008 13:57:39 +0000 Subject: [PATCH] fix some tests to take the right branch on OS/2 (hope I got the Tcl syntax right) (CVS 5593) FossilOrigin-Name: 10e62d4700c99faf07140a8204d3cd81481206ac --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- test/loadext.test | 4 ++-- test/misc7.test | 4 ++-- tool/omittest.tcl | 8 +++++--- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/manifest b/manifest index 70d6882858..ce5dc02fc6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Hide\s(for\snon-debugging\sbuilds)\sand\sremove\sDELETEONCLOSE\sfiles\son\sOS/2,\sfollowing\sthe\sWindows\sexample.\sTicket\s#3328.\s(CVS\s5592) -D 2008-08-22T13:47:57 +C fix\ssome\stests\sto\stake\sthe\sright\sbranch\son\sOS/2\s(hope\sI\sgot\sthe\sTcl\ssyntax\sright)\s(CVS\s5593) +D 2008-08-22T13:57:39 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 51b727303f84cf055e29514d8248e5eaf9701379 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -390,7 +390,7 @@ F test/laststmtchanges.test 18ead86c8a87ade949a1d5658f6dc4bb111d1b02 F test/like.test 2a3ddbd5d91503f914eabae67a47c4196fe33a58 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da F test/limit.test 2db7b3b34fb925b8e847d583d2eb67531d0ce67e -F test/loadext.test f79e5460c4664916a93ba6e7c762886153e2014b +F test/loadext.test 4972cb5a12ba70f23f827452b8265be08bb6d8cd F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca F test/lock.test 6825aea0b5885578b1b63a3b178803842c4ee9f1 F test/lock2.test 018b846f6f3b3b695fad07e317b7988442b556f4 @@ -432,7 +432,7 @@ F test/misc3.test 7212ed8dad01427e9acab9bd3e7e5e2c2e89be9e F test/misc4.test 91e8ed25c092c2bb4e0bb01864631e2930f8d7de F test/misc5.test 6a5c1e3217a95b0db05ff9a0f1ecb5ce9043ffef F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91 -F test/misc7.test fd424ff93a83bb6a31463eb043c588777d8215a8 +F test/misc7.test 0d763f703a34521e55ab30145b747aafa0e5f794 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33 F test/mutex1.test ee9fb9c12d03eb2291ab500a3ce30bcad6fb46e8 F test/mutex2.test 56f282f436596e9febdc6e0db2c507432b6724bb @@ -610,7 +610,7 @@ F tool/mkkeywordhash.c ef93810fc41fb3d3dbacf9a33a29be88ea99ffa9 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x F tool/mksqlite3c.tcl c4542127796826a26f89567c7bbaecafaf42a120 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87 -F tool/omittest.tcl 5a25ea687df5da8dd9b94bf1683f5cf2c210e51d +F tool/omittest.tcl 4be55add3ec87f45fe041b7bfa8f16dab8105431 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c F tool/report1.txt 9eae07f26a8fc53889b45fc833a66a33daa22816 F tool/showdb.c a086a3d788c7a23cb008317c3180ceb19f20bce0 @@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 2a365e29944f9fd45ca2903875a8c2e2759c9492 -R 57109e2c4d2f82977c4cd0376610232c +P 8aaa77000fb86fe512405a0ad40cb08678a12198 +R 90c51ef90aca648a6dca010f02b9d08a U pweilbacher -Z ec0f9d580f11413771c77027641fba31 +Z 1a9bc88c2eda9eebe512d73221dd8dba diff --git a/manifest.uuid b/manifest.uuid index 5382ed4fd0..31676e239d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8aaa77000fb86fe512405a0ad40cb08678a12198 \ No newline at end of file +10e62d4700c99faf07140a8204d3cd81481206ac \ No newline at end of file diff --git a/test/loadext.test b/test/loadext.test index e0fecd38f8..8c5db1fa60 100644 --- a/test/loadext.test +++ b/test/loadext.test @@ -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.14 2008/08/02 03:50:39 drh Exp $ +# $Id: loadext.test,v 1.15 2008/08/22 13:57:39 pweilbacher Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -23,7 +23,7 @@ ifcapable !load_ext { # The name of the test extension varies by operating system. # -if {$::tcl_platform(platform) eq "windows"} { +if {$::tcl_platform(platform) eq "windows" || $::tcl_platform(platform) eq "os2"} { set testextension ./testloadext.dll } else { set testextension ./libtestloadext.so diff --git a/test/misc7.test b/test/misc7.test index 111d802bfa..ef1d010f43 100644 --- a/test/misc7.test +++ b/test/misc7.test @@ -10,7 +10,7 @@ #*********************************************************************** # This file implements regression tests for SQLite library. # -# $Id: misc7.test,v 1.23 2008/08/02 03:50:40 drh Exp $ +# $Id: misc7.test,v 1.24 2008/08/22 13:57:39 pweilbacher Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -367,7 +367,7 @@ set sqlite_pager_n_sort_bucket 0 # These tests do not work on windows due to restrictions in the # windows file system. # -if {$tcl_platform(platform)!="windows"} { +if {$tcl_platform(platform)!="windows" && $tcl_platform(platform)!="os2"} { # Some network filesystems (ex: AFP) do not support setting read-only # permissions. Only run these tests if full unix permission setting diff --git a/tool/omittest.tcl b/tool/omittest.tcl index 13a70cd247..7fd8309209 100644 --- a/tool/omittest.tcl +++ b/tool/omittest.tcl @@ -1,5 +1,5 @@ -set rcsid {$Id: omittest.tcl,v 1.6 2008/08/04 03:51:24 danielk1977 Exp $} +set rcsid {$Id: omittest.tcl,v 1.7 2008/08/22 13:57:39 pweilbacher Exp $} # Documentation for this script. This may be output to stderr # if the script is invoked incorrectly. @@ -50,6 +50,8 @@ proc run_quick_test {dir omit_symbol_list} { set opts "-DSQLITE_MEMDEBUG -DSQLITE_DEBUG" if {$::tcl_platform(platform)=="windows"} { append opts " -DSQLITE_OS_WIN=1" + } elseif {$::tcl_platform(platform)=="os2"} { + append opts " -DSQLITE_OS_OS2=1" } else { append opts " -DSQLITE_OS_UNIX=1" } @@ -80,7 +82,7 @@ catch { # of trying to build the sqlite shell. The sqlite shell won't build # with some of the OMIT options (i.e OMIT_COMPLETE). set sqlite3_dummy $dir/sqlite3 - if {$::tcl_platform(platform)=="windows"} { + if {$::tcl_platform(platform)=="windows" || $::tcl_platform(platform)=="os2"} { append sqlite3_dummy ".exe" } if {![file exists $sqlite3_dummy]} { @@ -109,7 +111,7 @@ catch { # option. # proc process_options {argv} { - if {$::tcl_platform(platform)=="windows"} { + if {$::tcl_platform(platform)=="windows" || $::tcl_platform(platform)=="os2"} { set ::MAKEFILE ../Makefile ;# Default value } else { set ::MAKEFILE ../Makefile.linux-gcc ;# Default value