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

Fix the shellN.test test scripts so that they work with the --testdir option.

Browse Source 
FossilOrigin-Name: 051c61ebae921b70f843c55aacf046a9922cc187
This commit is contained in:
dan 2016-03-15 09:55:44 +00:00
parent a580936383
commit 089555c8e9
8 changed files with 36 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@ -1,5 +1,5 @@
C Fix\sthe\spermutations.test\sscript\sso\sthat\sit\sworks\sagain.
D 2016-03-14T21:26:25.596
C Fix\sthe\sshellN.test\stest\sscripts\sso\sthat\sthey\swork\swith\sthe\s--testdir\soption.
D 2016-03-15T09:55:44.853
F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@ -1025,11 +1025,11 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
F test/shell1.test a45b424ec23a4b946848ff9e1af5186c677162ab
F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
F test/shell4.test f43e250139dc5dc5f0f2ec1752c50284a1ede102
F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
F test/shell1.test e7dac9830b7d80432be9cebfae06eff9c18675f5
F test/shell2.test 2e7a32c9ee03c6398478637d72416d5b9ebd9777
F test/shell3.test c39453d3012a39ffec944566eca8a6bda10a2284
F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
@ -1085,7 +1085,7 @@ F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
F test/tester.tcl d6dee24773e20320ab64d39bb5ce6e1a91b6029e
F test/tester.tcl 859a7ccbe5bd65f0f8b524cd51c318d3edcd3008
F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P f4693ba4bbd9738b45012cf507fc0d7b6d04b7ee
R b91725f8858bc448d609dcaeb28fa81e
U drh
Z 51ddcfc985bc0e936856bdb8a64dca36
P 9f194f90c07d5415b1d6bb10ec049f74999d6885
R 50980fd60bfbb727ae154c36fe3906ce
U dan
Z f0681fd41f2ae1a8be1bbfb650e8fc11

2
manifest.uuid
View File

@ -1 +1 @@
9f194f90c07d5415b1d6bb10ec049f74999d6885
051c61ebae921b70f843c55aacf046a9922cc187

10
test/shell1.test
View File

@ -21,15 +21,7 @@
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
if {$tcl_platform(platform)=="windows"} {
set CLI "sqlite3.exe"
} else {
set CLI "./sqlite3"
}
if {![file executable $CLI]} {
finish_test
return
}
set CLI [test_find_cli]
db close
forcedelete test.db test.db-journal test.db-wal
sqlite3 db test.db

10
test/shell2.test
View File

@ -20,15 +20,7 @@
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
if {$tcl_platform(platform)=="windows"} {
set CLI "sqlite3.exe"
} else {
set CLI "./sqlite3"
}
if {![file executable $CLI]} {
finish_test
return
}
set CLI [test_find_cli]
db close
forcedelete test.db test.db-journal test.db-wal
sqlite3 db test.db

10
test/shell3.test
View File

@ -21,15 +21,7 @@
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
if {$tcl_platform(platform)=="windows"} {
set CLI "sqlite3.exe"
} else {
set CLI "./sqlite3"
}
if {![file executable $CLI]} {
finish_test
return
}
set CLI [test_find_cli]
db close
forcedelete test.db test.db-journal test.db-wal
sqlite3 db test.db

10
test/shell4.test
View File

@ -21,15 +21,7 @@
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
if {$tcl_platform(platform)=="windows"} {
set CLI "sqlite3.exe"
} else {
set CLI "./sqlite3"
}
if {![file executable $CLI]} {
finish_test
return
}
set CLI [test_find_cli]
db close
forcedelete test.db test.db-journal test.db-wal
sqlite3 db test.db

10
test/shell5.test
View File

@ -21,15 +21,7 @@
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
if {$tcl_platform(platform)=="windows"} {
set CLI "sqlite3.exe"
} else {
set CLI "./sqlite3"
}
if {![file executable $CLI]} {
finish_test
return
}
set CLI [test_find_cli]
db close
forcedelete test.db test.db-journal test.db-wal

18
test/tester.tcl
View File

@ -2136,6 +2136,24 @@ proc test_restore_config_pagecache {} {
sqlite3 db test.db
}
# Find the name of the 'shell' executable (e.g. "sqlite3.exe") to use for
# the tests in shell[1-5].test. If no such executable can be found, invoke
# [finish_test ; return] in the callers context.
#
proc test_find_cli {} {
if {$::tcl_platform(platform)=="windows"} {
set ret "sqlite3.exe"
} else {
set ret "sqlite3"
}
set ret [file normalize [file join $::cmdlinearg(TESTFIXTURE_HOME) $ret]]
if {![file executable $ret]} {
finish_test
return -code return
}
return $ret
}
# If the library is compiled with the SQLITE_DEFAULT_AUTOVACUUM macro set
# to non-zero, then set the global variable $AUTOVACUUM to 1.
set AUTOVACUUM $sqlite_options(default_autovacuum)