Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Test suite infrastructure enhancements. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
91e1dcb90780bbea09070d6ecf8a4150 |
| User & Date: | mistachkin 2012-10-15 12:56:52.511 |
Context
|
2012-10-15
| ||
| 18:37 | Add workload to the stress test that executes all the other SQL DML queries against the in-memory database. check-in: d391517f83 user: mistachkin tags: trunk | |
| 12:56 | Test suite infrastructure enhancements. check-in: 91e1dcb907 user: mistachkin tags: trunk | |
| 06:54 | Allow trace logging to a file to be disabled in the stress test. Display and log values of test overrides specified on the command line. check-in: ecd7bb0722 user: mistachkin tags: trunk | |
Changes
Changes to .fossil-settings/ignore-glob.
1 | Externals/Eagle/bin/Eagle*.pdb | > | 1 2 | *.mistachkin.eagle Externals/Eagle/bin/Eagle*.pdb |
Changes to Tests/common.eagle.
| ︙ | ︙ | |||
291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 |
#
# NOTE: Return the native-only interop assembly file name.
#
return [file nativename \
[file join [getBinaryDirectory] SQLite.Interop.dll]]
}
}
proc getDatabaseDirectory {} {
#
# NOTE: This procedure returns the directory where the test databases
# should be located. By default, this just uses the temporary
# directory configured for this system.
#
if {[info exists ::database_directory] && \
[string length $::database_directory] > 0} then {
#
# NOTE: The location of the database directory has been overridden;
# therefore, use it.
#
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 |
#
# NOTE: Return the native-only interop assembly file name.
#
return [file nativename \
[file join [getBinaryDirectory] SQLite.Interop.dll]]
}
}
proc getCommonDirectory {} {
#
# NOTE: This procedure returns the directory where the test scripts
# should be located. By default, this just returns the Eagle
# binary directory.
#
if {[info exists ::common_directory] && \
[string length $::common_directory] > 0} then {
#
# NOTE: The location of the common directory has been set;
# therefore, use it.
#
return $::common_directory
} elseif {[info exists ::vendor_directory] && \
[string length $::vendor_directory] > 0} then {
#
# NOTE: The location of the vendor directory has been set;
# therefore, use it.
#
return $::vendor_directory
} elseif {[info exists ::tcl_library] && \
[string length $::tcl_library] > 0 && \
[file isdirectory $::tcl_library]} then {
#
# NOTE: The variable with the location of the script library is
# set and appears to be a real directory (i.e. not embedded
# within a file); therefore, use it.
#
return $::tcl_library
} else {
#
# NOTE: Fallback to the directory containing the executable.
#
return [info binary]
}
}
proc getDatabaseDirectory {} {
#
# NOTE: This procedure returns the directory where the test databases
# should be located. By default, this just uses the temporary
# directory configured for this system.
#
if {[info exists ::database_directory] && \
[string length $::database_directory] > 0} then {
#
# NOTE: The location of the database directory has been overridden;
# therefore, use it.
#
return $::database_directory
} elseif {[info exists ::scratch_directory] && \
[string length $::scratch_directory] > 0} then {
#
# NOTE: The location of the scratch directory has been overridden;
# therefore, use it.
#
return $::scratch_directory
} else {
return [getTemporaryPath]
}
}
proc getTemporaryDirectory {} {
#
# NOTE: This procedure returns the directory where the temporary files
# should be located. By default, this just uses the temporary
# directory configured for this system.
#
if {[info exists ::temporary_directory] && \
[string length $::temporary_directory] > 0} then {
#
# NOTE: The location of the temporary directory has been overridden;
# therefore, use it.
#
return $::temporary_directory
} elseif {[info exists ::scratch_directory] && \
[string length $::scratch_directory] > 0} then {
#
# NOTE: The location of the scratch directory has been overridden;
# therefore, use it.
#
return $::scratch_directory
} else {
return [getTemporaryPath]
}
}
proc getTestOverridesPreamble { {extraVarNames ""} } {
set varNames [list]
|
| ︙ | ︙ | |||
1072 1073 1074 1075 1076 1077 1078 |
# is used by tests that change configuration options and/or those
# that need to make sure logging is initialized (i.e. just in case
# the SQLite core library was initialized in the process prior to
# the SQLiteLog class being able to setup its logging callback).
#
if {$force || [haveConstraint SQLite]} then {
if {[catch {object invoke -flags +NonPublic \
| | | | 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 |
# is used by tests that change configuration options and/or those
# that need to make sure logging is initialized (i.e. just in case
# the SQLite core library was initialized in the process prior to
# the SQLiteLog class being able to setup its logging callback).
#
if {$force || [haveConstraint SQLite]} then {
if {[catch {object invoke -flags +NonPublic \
System.Data.SQLite.UnsafeNativeMethods \
sqlite3_shutdown} result] == 0} then {
if {!$quiet} then {
tputs $channel [appendArgs \
"---- call sqlite3_shutdown()... ok: " $result \n]
}
} else {
if {!$quiet} then {
tputs $channel [appendArgs \
|
| ︙ | ︙ | |||
1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 |
if {[catch {executeSql $sql scalar} result] == 0} then {
tputs $channel [appendArgs "ok: \"" $result \"\n]
} else {
tputs $channel [appendArgs "error: " \n\t $result \n]
}
}
}
proc runSQLiteTestPrologue {} {
#
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 |
if {[catch {executeSql $sql scalar} result] == 0} then {
tputs $channel [appendArgs "ok: \"" $result \"\n]
} else {
tputs $channel [appendArgs "error: " \n\t $result \n]
}
}
}
proc loadSQLiteTestSettings { channel {quiet false} } {
#
# NOTE: Skip loading the settings if their usage has been disabled.
#
if {![info exists ::no(sqliteTestSettings)]} then {
#
# NOTE: Load custom per-user and/or per-host test settings now.
#
if {[info exists ::tcl_platform(user)]} then {
set userSettingsFileName [file join [getCommonDirectory] \
[appendArgs settings. $::tcl_platform(user) .eagle]]
if {[file exists $userSettingsFileName]} then {
if {!$quiet} then {
tputs $channel [appendArgs \
"---- loading per-user test settings file \"" \
$userSettingsFileName \"...\n]
}
if {[catch {uplevel 1 [list source $userSettingsFileName]} \
error]} then {
if {!$quiet} then {
tputs $channel [appendArgs \
"==== WARNING: failed to load per-user settings file \"" \
$userSettingsFileName "\", error: " \n\t $error \n]
}
}
}
}
#######################################################################
if {[info exists ::tcl_platform(host)]} then {
set hostSettingsFileName [file join [getCommonDirectory] \
[appendArgs settings. $::tcl_platform(host) .eagle]]
if {[file exists $hostSettingsFileName]} then {
if {!$quiet} then {
tputs $channel [appendArgs \
"---- loading per-host test settings file \"" \
$hostSettingsFileName \"...\n]
}
if {[catch {uplevel 1 [list source $hostSettingsFileName]} \
error]} then {
if {!$quiet} then {
tputs $channel [appendArgs \
"==== WARNING: failed to load per-host settings file \"" \
$hostSettingsFileName "\", error: " \n\t $error \n]
}
}
}
}
}
}
proc runSQLiteTestPrologue {} {
#
# NOTE: Skip running our custom prologue if the main one has been
# skipped.
#
if {![info exists ::no(prologue.eagle)]} then {
#
# NOTE: Skip all System.Data.SQLite related file handling (deleting,
# copying, and loading) if we are so instructed.
#
if {![info exists ::no(sqliteFiles)]} then {
|
| ︙ | ︙ | |||
1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 |
#
# NOTE: Show the active test constraints.
#
tputs $::test_channel [appendArgs "---- constraints: " \
[formatList [lsort [getConstraints]]] \n]
#
# NOTE: Show when our tests actually began (now).
#
tputs $::test_channel [appendArgs \
"---- System.Data.SQLite tests began at " \
[clock format [clock seconds]] \n]
}
}
proc runSQLiteTestEpilogue {} {
#
| > > > > > | > | 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 |
#
# NOTE: Show the active test constraints.
#
tputs $::test_channel [appendArgs "---- constraints: " \
[formatList [lsort [getConstraints]]] \n]
#
# NOTE: Load custom per-user and/or per-host test settings now.
#
uplevel 1 [list loadSQLiteTestSettings $::test_channel]
#
# NOTE: Show when our tests actually began (now).
#
tputs $::test_channel [appendArgs \
"---- System.Data.SQLite tests began at " \
[clock format [clock seconds]] \n]
}
}
proc runSQLiteTestEpilogue {} {
#
# NOTE: Skip running our custom epilogue if the main one has been
# skipped.
#
if {![info exists ::no(epilogue.eagle)]} then {
#
# NOTE: Show when our tests actually ended (now).
#
tputs $::test_channel [appendArgs \
"---- System.Data.SQLite tests ended at " \
|
| ︙ | ︙ |
Changes to Tests/stress.eagle.
| ︙ | ︙ | |||
236 237 238 239 240 241 242 243 244 245 246 247 248 249 |
set count(5) $options(-count5,value)
set noWorkload $options(-noWorkload,value)
set priorities $options(-priorities,value)
set exitOnFail $options(-exitOnFail,value)
set coTaskMem $options(-coTaskMem,value)
set noTrace $options(-noTrace,value)
}
#############################################################################
#
# NOTE: The trace listener used with the SQLiteLog class to capture output
# from the core SQLite library requires its own log file because the
# TextWriterTraceListener class opens and locks the log file it uses
| > > > > > > > > > > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 |
set count(5) $options(-count5,value)
set noWorkload $options(-noWorkload,value)
set priorities $options(-priorities,value)
set exitOnFail $options(-exitOnFail,value)
set coTaskMem $options(-coTaskMem,value)
set noTrace $options(-noTrace,value)
}
#############################################################################
#
# NOTE: Load custom per-user and/or per-host test settings. Currently, this
# is done after processing the command line options. The settings file
# should take into account the existing workload parameters and avoid
# changing any that may have already been overridden.
#
loadSQLiteTestSettings $test_channel
#############################################################################
#
# NOTE: The trace listener used with the SQLiteLog class to capture output
# from the core SQLite library requires its own log file because the
# TextWriterTraceListener class opens and locks the log file it uses
|
| ︙ | ︙ |