Fix another problem in test script rbudiff.test.

FossilOrigin-Name: 41c29c123ff347db720ed1a541c0b2ffc04670aa
This commit is contained in:
dan 2016-03-19 15:13:59 +00:00
parent 1e8dae0e43
commit 49aed58b7f
3 changed files with 14 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Fix\stest\sscripts\ssqldiff.test\sand\srbudiff.test\sso\sthat\sthey\swork\swith\sthe\s--testdir\soption. C Fix\sanother\sproblem\sin\stest\sscript\srbudiff.test.
D 2016-03-19T14:53:36.705 D 2016-03-19T15:13:59.043
F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@ -1085,7 +1085,7 @@ F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6 F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
F test/tester.tcl d9831491ddc902ef62ef11438eca83ac0d4cf969 F test/tester.tcl 2a82a76c1704a1d5f6c71bcebcffc3041e4d9856
F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 88439a866b3b16ad7c308ebe59198662a05e7eeb P 1ffe3cde03f924bb8405a8729c8e1bc01f5b6d3b
R 3b6913cf00d6ce7b8c04137012202e6b R b5342d0d86cc431c9e51a0ed18eda8f1
U dan U dan
Z d63e42a30b9cbf754c53eb2c6783a9e9 Z 45d735e7ccd57967a5a5daaae9ccf4a0

View File

@ -1 +1 @@
1ffe3cde03f924bb8405a8729c8e1bc01f5b6d3b 41c29c123ff347db720ed1a541c0b2ffc04670aa

View File

@ -2145,7 +2145,7 @@ proc test_find_binary {nm} {
set ret [file normalize [file join $::cmdlinearg(TESTFIXTURE_HOME) $ret]] set ret [file normalize [file join $::cmdlinearg(TESTFIXTURE_HOME) $ret]]
if {![file executable $ret]} { if {![file executable $ret]} {
finish_test finish_test
return -code return return ""
} }
return $ret return $ret
} }
@ -2155,7 +2155,9 @@ proc test_find_binary {nm} {
# [finish_test ; return] in the callers context. # [finish_test ; return] in the callers context.
# #
proc test_find_cli {} { proc test_find_cli {} {
uplevel test_find_binary sqlite3 set cli [test_find_binary sqlite3]
if {$prog==""} { return -code return }
return $prog
} }
# Find the name of the 'sqldiff' executable (e.g. "sqlite3.exe") to use for # Find the name of the 'sqldiff' executable (e.g. "sqlite3.exe") to use for
@ -2163,7 +2165,9 @@ proc test_find_cli {} {
# [finish_test ; return] in the callers context. # [finish_test ; return] in the callers context.
# #
proc test_find_sqldiff {} { proc test_find_sqldiff {} {
uplevel test_find_binary sqldiff set prog [test_find_binary sqldiff]
if {$prog==""} { return -code return }
return $prog
} }