Fixes for testrunner.tcl on windows.
FossilOrigin-Name: 26ae090889640bfcf02a6dd5aa58044edd4d0708a11d8e005149f1a3c8495bba
This commit is contained in:
parent
d7def73c97
commit
9b0e9f9089
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
||||
C Another\sfix\sfor\svalgrind\spermutation.\sRemove\sthe\s"copydir"\stable\scolumn\s-\sjust\sadd\sa\s[cp]\sor\s[copy]\scommand\sto\sthe\stest\sscript\swhere\sthis\sfunctionality\sis\srequired.
|
||||
D 2023-08-28T16:28:00.788
|
||||
C Fixes\sfor\stestrunner.tcl\son\swindows.
|
||||
D 2023-08-28T18:15:14.092
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@ -1615,8 +1615,8 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
|
||||
F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
|
||||
F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
|
||||
F test/tester.tcl 68454ef88508c196d19e8694daa27bff7107a91857799eaa12f417188ae53ede
|
||||
F test/testrunner.tcl 139d4bfb5acd8b3bf45dbc3706c5fa4d226664d2540d5ccd3b4cf1034891fa01
|
||||
F test/testrunner_data.tcl fdcc95d995fd1ef8bbaac1bc105988016213037038161bb555100439793ada18
|
||||
F test/testrunner.tcl c88eae7d8ba9825d09f080ee2aa98b8e65c381bb56b4d427fb492625d2d4c36b
|
||||
F test/testrunner_data.tcl 12b12a5661a8b6b005ec8ca6c5ad37f6847321c2cf5982d828aeea114bb1a579
|
||||
F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
|
||||
F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
|
||||
F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
|
||||
@ -2104,8 +2104,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P ccbf06760e8377f9209ba3fd4895a25fe1a5ea688c384bf357e765b6a2b4c2f7
|
||||
R ccaea0ec1aaf4f06cc5606ae7b37bb7e
|
||||
P 448b9a575e66960a0885864f88b99b6ea15655c77a42eef956c09c8dc70e539a
|
||||
R 9124fb12ae32ed43e0e40441bac52bec
|
||||
U dan
|
||||
Z 7dad289e4c25c548365d88153d7b3fb1
|
||||
Z 400d2ab7933216b29ca834eae65f3a8d
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
@ -1 +1 @@
|
||||
448b9a575e66960a0885864f88b99b6ea15655c77a42eef956c09c8dc70e539a
|
||||
26ae090889640bfcf02a6dd5aa58044edd4d0708a11d8e005149f1a3c8495bba
|
@ -190,6 +190,36 @@ set TRG(schema) {
|
||||
/*
|
||||
** This table contains one row for each job that testrunner.tcl must run
|
||||
** before the entire test run is finished.
|
||||
**
|
||||
** jobid:
|
||||
** Unique identifier for each job. Must be a +ve non-zero number.
|
||||
**
|
||||
** displaytype:
|
||||
** 3 or 4 letter mnemonic for the class of tests this belongs to e.g.
|
||||
** "fuzz", "tcl", "make" etc.
|
||||
**
|
||||
** displayname:
|
||||
** Name/description of job. For display purposes.
|
||||
**
|
||||
** build:
|
||||
** If the job requires a make.bat/make.sh make wrapper (i.e. to build
|
||||
** something), the name of the build configuration it uses. See
|
||||
** testrunner_data.tcl for a list of build configs. e.g. "Win32-MemDebug".
|
||||
**
|
||||
** dirname:
|
||||
** If the job should use a well-known directory name for its
|
||||
** sub-directory instead of an anonymous "testdir[1234...]" sub-dir
|
||||
** that is deleted after the job is finished.
|
||||
**
|
||||
** cmd:
|
||||
** Bash or batch script to run the job.
|
||||
**
|
||||
** depid:
|
||||
** The jobid value of a job that this job depends on. This job may not
|
||||
** be run before its depid job has finished successfully.
|
||||
**
|
||||
** priority:
|
||||
** Higher values run first. Sometimes.
|
||||
*/
|
||||
CREATE TABLE jobs(
|
||||
/* Fields populated when db is initialized */
|
||||
@ -660,7 +690,8 @@ proc add_make_job {bld target} {
|
||||
global TRG
|
||||
|
||||
if {$TRG(platform)=="win"} {
|
||||
set cmd "copy [lindex $bld 1]\\* ."
|
||||
set path [string map {/ \\} [lindex $bld 1]]
|
||||
set cmd "xcopy /S $path\\* ."
|
||||
} else {
|
||||
set cmd "cp -r [lindex $bld 1]/* ."
|
||||
}
|
||||
|
@ -398,14 +398,14 @@ proc trd_extras {platform bld} {
|
||||
#
|
||||
proc trd_fuzztest_data {} {
|
||||
set EXE ""
|
||||
if {$::tcl_platform(platform)=="windows"} {
|
||||
set EXE ".exe"
|
||||
}
|
||||
|
||||
set lFuzzDb [glob [file join $::testdir fuzzdata*.db]]
|
||||
set lSessionDb [glob [file join $::testdir sessionfuzz-data*.db]]
|
||||
|
||||
return [list fuzzcheck$EXE $lFuzzDb "sessionfuzz$EXE run" $lSessionDb]
|
||||
if {$::tcl_platform(platform)=="windows"} {
|
||||
return [list fuzzcheck.exe $lFuzzDb]
|
||||
}
|
||||
|
||||
return [list fuzzcheck $lFuzzDb sessionfuzz $lSessionDb]
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user