Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Update Eagle in externals to the latest trunk code. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
67be01e9c675a23e5f8f07c557b7cbb1 |
User & Date: | mistachkin 2013-08-08 07:33:52.338 |
Context
2013-08-13
| ||
20:47 | Check the result of sqlite3_column_name against NULL. Also, return false for the SQLiteParameterCollection.IsSynchronized property because it is not thread-safe. These issues were reported via the mailing list. check-in: 7a1efd7d40 user: mistachkin tags: trunk | |
2013-08-08
| ||
07:33 | Update Eagle in externals to the latest trunk code. check-in: 67be01e9c6 user: mistachkin tags: trunk | |
00:37 | Final updates for release 1.0.88.0. check-in: 4dc52a42ad user: mistachkin tags: trunk, release, release-1.0.88.0 | |
Changes
Changes to .fossil-settings/ignore-glob.
1 2 3 4 5 6 7 | *.mistachkin.eagle *.sln Externals/Eagle/bin/Eagle*.pdb SQLite.Interop/*.vcxproj SQLite.Interop/*.vcxproj.filters System.Data.SQLite/*.csproj testce/*.csproj | > > | 1 2 3 4 5 6 7 8 9 | *.mistachkin.eagle *.sln Externals/Eagle/bin/Eagle*.pdb Externals/Eagle/bin/x64/Spilornis.pdb Externals/Eagle/bin/x86/Spilornis.pdb SQLite.Interop/*.vcxproj SQLite.Interop/*.vcxproj.filters System.Data.SQLite/*.csproj testce/*.csproj |
Changes to Externals/Eagle/bin/Eagle.dll.
cannot compute difference between binary files
Changes to Externals/Eagle/bin/EagleShell.exe.
cannot compute difference between binary files
Changes to Externals/Eagle/bin/EagleShell.exe.config.
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | * * RCS: @(#) $Id: $ * --> <configuration> <startup useLegacyV2RuntimeActivationPolicy="true"> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /> </startup> <runtime> <!-- <legacyCorruptedStateExceptionsPolicy enabled="true" /> <NetFx40_LegacySecurityPolicy enabled="true" /> <generatePublisherEvidence enabled="false" /> --> <!-- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Eagle" publicKeyToken="29c6297630be05eb" culture="neutral" /> | > > > > > > > > > > | | > > > > > > > > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | * * RCS: @(#) $Id: $ * --> <configuration> <startup useLegacyV2RuntimeActivationPolicy="true"> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /> <!-- <supportedRuntime version="v2.0.50727" /> <supportedRuntime version="v4.0.30319" /> --> <!-- <requiredRuntime version="v2.0.50727" safemode="false" /> <requiredRuntime version="v4.0.30319" safemode="false" /> --> </startup> <runtime> <!-- <legacyCorruptedStateExceptionsPolicy enabled="true" /> <NetFx40_LegacySecurityPolicy enabled="true" /> <generatePublisherEvidence enabled="false" /> --> <!-- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="Eagle" publicKeyToken="29c6297630be05eb" culture="neutral" /> <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535" newVersion="[info engine PatchLevel]" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="Eagle" publicKeyToken="1e22ec67879739a2" culture="neutral" /> <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535" newVersion="[info engine PatchLevel]" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="Eagle" publicKeyToken="358030063a832bc3" culture="neutral" /> <bindingRedirect oldVersion="1.0.0.0-1.0.65535.65535" newVersion="[info engine PatchLevel]" /> </dependentAssembly> </assemblyBinding> --> </runtime> </configuration> |
Added Externals/Eagle/bin/x64/Spilornis.dll.
cannot compute difference between binary files
Added Externals/Eagle/bin/x86/Spilornis.dll.
cannot compute difference between binary files
Changes to Externals/Eagle/lib/Eagle1.0/init.eagle.
︙ | ︙ | |||
55 56 57 58 59 60 61 62 63 64 65 66 67 68 | [catch {tcl eval [tcl master] garuda packageid} packageId] == 0}] } else { return [expr {[catch {package present Garuda}] == 0 && \ [catch {garuda packageid} packageId] == 0}] } } # # NOTE: This is the procedure that detects whether or not we are # running in Eagle on Mono (otherwise, we are running in Tcl # or in Eagle on .NET). This procedure must function correctly # in both Tcl and Eagle and must return non-zero only when # running in Eagle on Mono. # | > > > > > > > > > > > > > > > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | [catch {tcl eval [tcl master] garuda packageid} packageId] == 0}] } else { return [expr {[catch {package present Garuda}] == 0 && \ [catch {garuda packageid} packageId] == 0}] } } proc isTclThread { name } { # # NOTE: For now, this check only works in Eagle. # set result false if {[isEagle]} then { catch { if {[llength [info commands tcl]] > 0 && [tcl ready] && \ [lsearch -exact -- [tcl threads] $name] != -1} then { # # NOTE: The name specified by the caller appears in the # list of Tcl threads for this Eagle interpreter. # set result true } } } return $result } # # NOTE: This is the procedure that detects whether or not we are # running in Eagle on Mono (otherwise, we are running in Tcl # or in Eagle on .NET). This procedure must function correctly # in both Tcl and Eagle and must return non-zero only when # running in Eagle on Mono. # |
︙ | ︙ | |||
1383 1384 1385 1386 1387 1388 1389 | } proc getDefaultValue { typeName } { if {[string length $typeName] == 0} then { return "" } | | | 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 | } proc getDefaultValue { typeName } { if {[string length $typeName] == 0} then { return "" } set type [object invoke -create -alias Type GetType $typeName] if {[string length $type] == 0} then { return "" } return [expr {[$type IsValueType] ? 0 : "null"}] } |
︙ | ︙ | |||
1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 | } } } return $result } ########################################################################### ############################# END Eagle ONLY ############################## ########################################################################### } else { ########################################################################### ############################# BEGIN Tcl ONLY ############################## ########################################################################### | > > > > > > > > > > > | 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 | } } } return $result } proc loadWordTcl { directory } { uplevel 1 [list source [file join $directory word.tcl]] } # # NOTE: Add script library files borrowed from native Tcl. # if {![interp issafe]} then { loadWordTcl [file dirname [info script]] } ########################################################################### ############################# END Eagle ONLY ############################## ########################################################################### } else { ########################################################################### ############################# BEGIN Tcl ONLY ############################## ########################################################################### |
︙ | ︙ | |||
1849 1850 1851 1852 1853 1854 1855 | } # # NOTE: Exports the necessary commands from this package and import them # into the global namespace. # exportAndImportPackageCommands [namespace current] [list \ | | | | | | | | | | | 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 | } # # NOTE: Exports the necessary commands from this package and import them # into the global namespace. # exportAndImportPackageCommands [namespace current] [list \ isEagle haveGaruda isTclThread isMono getEnvironmentVariable \ combineFlags getCompileInfo getPlatformInfo getPluginPath appendArgs \ lappendArgs getDictionaryValue getColumnValue getRowColumnValue \ tqputs tqlog readFile readSharedFile writeFile appendFile \ appendLogFile appendSharedFile appendSharedLogFile readAsciiFile \ writeAsciiFile readUnicodeFile writeUnicodeFile getDirResultPath \ addToPath removeFromPath execShell lshuffle ldifference filter map \ reduce getLengthModifier debug findDirectories findFiles \ findFilesRecursive exportAndImportPackageCommands] false false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### } # # NOTE: Provide the Eagle library package to the interpreter. # package provide Eagle.Library \ [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}] } |
Changes to Externals/Eagle/lib/Eagle1.0/test.eagle.
︙ | ︙ | |||
97 98 99 100 101 102 103 | return Software } } proc haveConstraint { name } { if {[isEagle]} then { return [expr { | | | | | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | return Software } } proc haveConstraint { name } { if {[isEagle]} then { return [expr { [info exists ::eagle_tests(Constraints)] && \ [lsearch -exact $::eagle_tests(Constraints) $name] != -1}] } else { return [expr { [info exists ::tcltest::testConstraints($name)] && \ $::tcltest::testConstraints($name)}] } } proc addConstraint { name {value 1} } { if {[isEagle]} then { if {[info exists ::eagle_tests(Constraints)] && \ [lsearch -exact $::eagle_tests(Constraints) $name] == -1 && \ $value} then { lappend ::eagle_tests(Constraints) $name } } else { ::tcltest::testConstraint $name $value } return "" } |
︙ | ︙ | |||
136 137 138 139 140 141 142 | } } proc getConstraints {} { set result [list] if {[isEagle]} then { | | | | | | | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | } } proc getConstraints {} { set result [list] if {[isEagle]} then { if {[catch {set ::eagle_tests(Constraints)} constraints] == 0} then { eval lappend result $constraints } } else { foreach name [array names ::tcltest::testConstraints] { if {$::tcltest::testConstraints($name)} then { lappend result $name } } } return $result } proc removeConstraint { name } { if {[isEagle]} then { if {[info exists ::eagle_tests(Constraints)]} then { set index [lsearch -exact $::eagle_tests(Constraints) $name] if {$index != -1} then { set ::eagle_tests(Constraints) [lreplace \ $::eagle_tests(Constraints) $index $index] } } } else { if {[info exists ::tcltest::testConstraints($name)]} then { unset ::tcltest::testConstraints($name) } } |
︙ | ︙ | |||
196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | set result [join [split $result] " && "] } } } return $result } proc calculateBogoCops { {milliseconds 2000} {legacy false} } { # # NOTE: Verify that the number of milliseconds requested is greater than # zero. # if {$milliseconds <= 0} then { error "number of milliseconds must be greater than zero" } # # HACK: Different techniques are used here to calculate the performance of # the machine for Tcl and Eagle. # | > > > > > > > > > > > > > > > > > > > > > > > | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 | set result [join [split $result] " && "] } } } return $result } proc testArrayGet { varName {integer false} } { # # NOTE: Returns the results of [array get] in a well-defined order. # upvar 1 $varName array # # NOTE: Build the command that will sort the array names into order. # set command [list lsort] if {$integer} then {lappend command -integer} lappend command [array names array] set result [list] foreach name [eval $command] { lappend result $name $array($name) } return $result } proc calculateBogoCops { {milliseconds 2000} {legacy false} } { # # NOTE: Verify that the number of milliseconds requested is greater than # zero. # if {$milliseconds <= 0} then { unset -nocomplain ::test_suite_running error "number of milliseconds must be greater than zero" } # # HACK: Different techniques are used here to calculate the performance of # the machine for Tcl and Eagle. # |
︙ | ︙ | |||
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 | } } } } return $value } proc sourceIfValid { type fileName } { if {[string length $fileName] > 0} then { if {[file exists $fileName]} then { tputs $::test_channel [appendArgs \ "---- evaluating $type file: \"" $fileName \"\n] if {[catch {uplevel 1 [list source $fileName]} error]} then { tputs $::test_channel [appendArgs \ "---- error during $type file: " $error \n] # # NOTE: The error has been logged, now re-throw it. # error $error $::errorInfo $::errorCode } } else { tputs $::test_channel [appendArgs \ "---- skipped $type file: \"" $fileName \ "\", it does not exist\n"] } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 | } } } } return $value } proc formatTimeStamp { seconds {gmt false} } { if {[isEagle]} then { return [clock format $seconds -gmt $gmt -iso -isotimezone] } else { return [clock format $seconds -gmt $gmt -format "%Y-%m-%dT%H:%M:%S %Z"] } } proc formatElapsedTime { seconds } { if {[isEagle]} then { # # NOTE: Create a TimeSpan instance based on the number of whole # seconds. # set timeSpan [object invoke -create -alias TimeSpan FromSeconds \ $seconds] # # NOTE: Return the number of seconds and a human readable string # representing the TimeSpan instance created based on that # same number of seconds. # return [appendArgs $seconds " seconds (" [$timeSpan ToString] \ " elapsed time)"] } else { # # NOTE: Unfortunately, there is no built-in native Tcl command # that can correctly format an elapsed time; therefore, # just return the number of whole seconds. # return [appendArgs $seconds " seconds"] } } proc sourceIfValid { type fileName } { if {[string length $fileName] > 0} then { if {[file exists $fileName]} then { tputs $::test_channel [appendArgs \ "---- evaluating $type file: \"" $fileName \"\n] if {[catch {uplevel 1 [list source $fileName]} error]} then { tputs $::test_channel [appendArgs \ "---- error during $type file: " $error \n] # # NOTE: The error has been logged, now re-throw it. # unset -nocomplain ::test_suite_running error $error $::errorInfo $::errorCode } } else { tputs $::test_channel [appendArgs \ "---- skipped $type file: \"" $fileName \ "\", it does not exist\n"] } |
︙ | ︙ | |||
972 973 974 975 976 977 978 979 980 981 982 983 984 985 | # raise an error now. If we are being run from inside # runAllTests, this will also serve to signal it to stop # processing further test files. # if {$code != 0 && [isStopOnFailure]} then { tresult Error "OVERALL RESULT: STOP-ON-FAILURE\n" error ""; # no message } } else { if {$error} then { tputs $::test_channel [appendArgs "ERROR (runTest): " $result \n] } | > | 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 | # raise an error now. If we are being run from inside # runAllTests, this will also serve to signal it to stop # processing further test files. # if {$code != 0 && [isStopOnFailure]} then { tresult Error "OVERALL RESULT: STOP-ON-FAILURE\n" unset -nocomplain ::test_suite_running error ""; # no message } } else { if {$error} then { tputs $::test_channel [appendArgs "ERROR (runTest): " $result \n] } |
︙ | ︙ | |||
1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 | } # # NOTE: If the test raised an error, re-raise it now; otherwise, # just return the result. # if {$error} then { error $result } else { return $result } } proc recordTestStatistics { varName index } { | > | 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 | } # # NOTE: If the test raised an error, re-raise it now; otherwise, # just return the result. # if {$error} then { unset -nocomplain ::test_suite_running error $result } else { return $result } } proc recordTestStatistics { varName index } { |
︙ | ︙ | |||
1150 1151 1152 1153 1154 1155 1156 | if {$count > 0 && \ [lsearch -exact $fileNames [file tail $fileName]] == -1} then { lappend fileNames [file tail $fileName] } } proc formatList { list {default ""} {columns 1} } { | | | > | | | | | | | | | | | | | | > > > > | | | | | | | | | | | | | | | | | > > > | 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 | if {$count > 0 && \ [lsearch -exact $fileNames [file tail $fileName]] == -1} then { lappend fileNames [file tail $fileName] } } proc formatList { list {default ""} {columns 1} } { if {[catch { set result "" set count 1 foreach item $list { if {[incr count -1] == 0} then { set count $columns append result \n } append result \t if {[string length $item] > 0} then { append result $item } else { append result <noItem> } } }] == 0} then { return [expr {[string length $result] > 0 ? $result : $default}] } else { return "" } } proc formatListAsDict { list {default ""} } { if {[catch { set result "" foreach {name value} $list { append result \n\t if {[string length $name] > 0} then { append result $name } else { append result <noName> } append result ": " if {[string length $value] > 0} then { append result $value } else { append result <noValue> } } }] == 0} then { return [expr {[string length $result] > 0 ? $result : $default}] } else { return "" } } proc pathToRegexp { path {list false} } { # # NOTE: This procedure needs to escape all characters that # have any special meaning to the regular expression # engine. Typically, the only characters we need to |
︙ | ︙ | |||
1275 1276 1277 1278 1279 1280 1281 | proc clearTestPercent { channel } { if {[isEagle]} then { host title "" } } | | > > > > > > > > > | | > > > | 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 | proc clearTestPercent { channel } { if {[isEagle]} then { host title "" } } proc reportTestPercent { channel percent totalFiles failedFiles leakedFiles } { if {[isEagle]} then { set totalTests $::eagle_tests(Total) set failedTests $::eagle_tests(Failed) } else { set totalTests $::tcltest::numTests(Total) set failedTests $::tcltest::numTests(Failed) } set status [appendArgs \ "---- test suite running, about " $percent "% complete (" \ $totalTests " tests total, " $failedTests " tests failed, " \ $totalFiles " files total, " $failedFiles " files failed, " \ $leakedFiles " files leaked)..."] tputs $channel [appendArgs $status \n] if {[isEagle]} then { host title $status } } |
︙ | ︙ | |||
1370 1371 1372 1373 1374 1375 1376 | # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ | | | 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 | # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ $total [llength $failed] [llength $leaked] set lastPercent $percent } # # NOTE: Skipping over any file name that matches a pattern in the # list of file names to skip. |
︙ | ︙ | |||
1447 1448 1449 1450 1451 1452 1453 | # set ::test_file $fileName # # NOTE: Record failed test count before this file. # if {[isEagle]} then { | | | 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 | # set ::test_file $fileName # # NOTE: Record failed test count before this file. # if {[isEagle]} then { set before $::eagle_tests(Failed) } else { set before $::tcltest::numTests(Failed) } # # NOTE: Evaluate the file in the context of the caller, # catching any errors. If an error is raised and the |
︙ | ︙ | |||
1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 | # if {[isStopOnFailure]} then { # # NOTE: This will terminate the loop right after the test # file cleanup code (i.e. at the bottom of the loop). # set stop true } } # # NOTE: We evaluated another test file. # incr count # # NOTE: Record failed test count after this file. # if {[isEagle]} then { | > > > > > > > > > > > > > > > > > > > > > | | | 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 | # if {[isStopOnFailure]} then { # # NOTE: This will terminate the loop right after the test # file cleanup code (i.e. at the bottom of the loop). # set stop true # # BUGFIX: If there are no actual test failures recorded yet, # make sure there is one now. This is necessary to # handle the case where an error occurs in a test # file that does not directly cause at least one of # its contained tests to fail. Otherwise, the test # suite will still be stopped; however, an overall # result of success will be returned by the process. # if {[isEagle]} then { if {$::eagle_tests(Failed) == 0} then { incr ::eagle_tests(Total) incr ::eagle_tests(Failed) } } else { if {$::tcltest::numTests(Failed) == 0} then { incr ::tcltest::numTests(Total) incr ::tcltest::numTests(Failed) } } } } # # NOTE: We evaluated another test file. # incr count # # NOTE: Record failed test count after this file. # if {[isEagle]} then { set after $::eagle_tests(Failed) } else { set after $::tcltest::numTests(Failed) } # # NOTE: Did this file have any failing tests? # if {$after > $before} then { lappend failed [file tail $fileName] } # # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ $total [llength $failed] [llength $leaked] set lastPercent $percent } # # NOTE: Unset the current test file name, it is no longer # needed. |
︙ | ︙ | |||
1557 1558 1559 1560 1561 1562 1563 | # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ | | | 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 | # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ $total [llength $failed] [llength $leaked] set lastPercent $percent } # # NOTE: If the test file raised an error (i.e. to indicate a # test failure with the stop-on-failure flag enabled), |
︙ | ︙ | |||
1592 1593 1594 1595 1596 1597 1598 | # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ | | | 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 | # NOTE: In terms of files, not tests, what percent done are we now? # set percent [formatDecimal \ [expr {$total != 0 ? 100.0 * ($count / double($total)) : 100}]] if {$percent != $lastPercent} then { reportTestPercent $channel $percent \ $total [llength $failed] [llength $leaked] set lastPercent $percent } } # # NOTE: Reset the host title because we may have changed it in the for |
︙ | ︙ | |||
1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 | if {[llength $leaked] > 0} then { tputs $channel [appendArgs "---- files with leaking tests: " \ [formatList $leaked] \n] } reportTestStatisticCounts $channel leaks } proc configureTcltest { constraints imports force } { if {[isEagle]} then { # # HACK: Flag the "test" and "runTest" script library procedures so # that they use the script location of their caller and not # their own. # # BUGBUG: Even this does not yet fix the script location issues in # the test suite: # # debug procedureflags test +ScriptLocation # debug procedureflags runTest +ScriptLocation # | > > > > > > > > | < < < < < | < < < < < < < < < < < | 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 | if {[llength $leaked] > 0} then { tputs $channel [appendArgs "---- files with leaking tests: " \ [formatList $leaked] \n] } reportTestStatisticCounts $channel leaks } proc isTestSuiteRunning {} { # # NOTE: Return non-zero if the test suite appears to be running. # return [expr {[info exists ::test_suite_running] && \ $::test_suite_running}] } proc configureTcltest { constraints imports force } { if {[isEagle]} then { # # HACK: Flag the "test" and "runTest" script library procedures so # that they use the script location of their caller and not # their own. # # BUGBUG: Even this does not yet fix the script location issues in # the test suite: # # debug procedureflags test +ScriptLocation # debug procedureflags runTest +ScriptLocation # # NOTE: Setup the necessary compatibility shims for the test suite. # setupTestShims true [expr {![isTestSuiteRunning]}] # # NOTE: Fake having the tcltest package. # package provide tcltest 2.2.10; # Tcl 8.4 } else { # |
︙ | ︙ | |||
1740 1741 1742 1743 1744 1745 1746 | proc initializeTests {} { uplevel #0 { # # NOTE: Reset the information in the global "tests" array, which is # used to interface with the internal test tracking information # in the interpreter via a variable trace. # | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 | proc initializeTests {} { uplevel #0 { # # NOTE: Reset the information in the global "tests" array, which is # used to interface with the internal test tracking information # in the interpreter via a variable trace. # set eagle_tests(Total) 0 set eagle_tests(Skipped) 0 set eagle_tests(Passed) 0 set eagle_tests(Failed) 0 # # NOTE: Setup the lists of patterns to match test names against. In # Eagle, these originate from the command line arguments and are # passed to the interpreter via this virtual array. # if {[info exists test_flags(-match)]} then { set eagle_tests(MatchNames) $test_flags(-match); # run these tests. } else { set eagle_tests(MatchNames) [list *]; # default to running all tests. } if {[info exists test_flags(-skip)]} then { set eagle_tests(SkipNames) $test_flags(-skip); # skip these tests. } else { set eagle_tests(SkipNames) [list]; # default to skipping no tests. } # # NOTE: What tests have been skipped, if any? # set eagle_tests(SkippedNames) [list] # # NOTE: What tests have failed, if any? # set eagle_tests(FailedNames) [list] # # NOTE: Initialize the list of active test constraints from the # environment variable and/or the test flags. # set eagle_tests(Constraints) [getEnvironmentVariable testConstraints] if {[info exists test_flags(-constraints)]} then { eval lappend eagle_tests(Constraints) $test_flags(-constraints) } } } proc getTestChannelOrDefault {} { if {[info exists ::test_channel]} then { return $::test_channel } return stdout; # TODO: Good default? } proc setupTestShims { setup {quiet false} } { if {$setup} then { # # HACK: Compatibility shim(s) for use with various tests in the Tcl # test suite. Make sure these commands do not already exist # prior to attempt to adding them. # if {[llength [info commands testConstraint]] == 0} then { interp alias {} testConstraint {} haveOrAddConstraint if {!$quiet} then { tqputs [getTestChannelOrDefault] [appendArgs \ "---- added \"testConstraint\" alias\n"] } } if {[llength [info commands ::tcltest::testConstraint]] == 0} then { interp alias {} ::tcltest::testConstraint {} haveOrAddConstraint if {!$quiet} then { tqputs [getTestChannelOrDefault] [appendArgs \ "---- added \"::tcltest::testConstraint\" alias\n"] } } # # NOTE: This is needed by most tests in the Tcl test suite. Make # sure this command does not already exist prior to adding it. # if {[llength [info commands ::tcltest::cleanupTests]] == 0} then { proc ::tcltest::cleanupTests { args } {} if {!$quiet} then { tqputs [getTestChannelOrDefault] [appendArgs \ "---- added \"::tcltest::cleanupTests\" procedure\n"] } } } else { # # NOTE: Remove the compatibility shim command aliases that we setup # earlier. # if {[lsearch -exact [info commands] \ ::tcltest::cleanupTests] != -1} then { rename ::tcltest::cleanupTests "" if {!$quiet} then { tqputs $::test_channel [appendArgs \ "---- removed \"::tcltest::cleanupTests\" procedure\n"] } } if {[lsearch -exact [interp aliases] \ ::tcltest::testConstraint] != -1} then { interp alias {} ::tcltest::testConstraint {} {} if {!$quiet} then { tqputs $::test_channel [appendArgs \ "---- removed \"::tcltest::testConstraint\" alias\n"] } } if {[lsearch -exact [interp aliases] testConstraint] != -1} then { interp alias {} testConstraint {} {} if {!$quiet} then { tqputs $::test_channel [appendArgs \ "---- removed \"testConstraint\" alias\n"] } } } } proc tresult { code result } { host result $code $result; tlog $result } proc getPassPercentage {} { if {$::eagle_tests(Total) > 0} then { return [expr \ {100.0 * (($::eagle_tests(Passed) + \ $::eagle_tests(Skipped)) / \ double($::eagle_tests(Total)))}] } return 0; # no tests were run, etc. } proc getSkipPercentage {} { if {$::eagle_tests(Total) > 0} then { return [expr \ {100.0 * ($::eagle_tests(Skipped) / \ double($::eagle_tests(Total)))}] } return 0; # no tests were run, etc. } proc cleanupThread { thread {timeout 2000} } { if {[$thread IsAlive]} then { |
︙ | ︙ | |||
1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 | } } else { return true; # already dead? } return false; # still alive (or error). } proc evalWithTimeout { script {milliseconds 2000} {resultVarName ""} } { # # NOTE: Verify that the number of milliseconds requested is greater than # zero. # if {$milliseconds <= 0} then { | > > > > > > > > > > > > | 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 | } } else { return true; # already dead? } return false; # still alive (or error). } proc purgeAndCleanup { channel name } { catch {uplevel 1 [list debug purge]} result tputs $channel [appendArgs \ "---- purge \"" $name "\" results: " $result \n] catch {uplevel 1 [list debug cleanup]} result tputs $channel [appendArgs \ "---- cleanup \"" $name "\" results: " $result \n] } proc evalWithTimeout { script {milliseconds 2000} {resultVarName ""} } { # # NOTE: Verify that the number of milliseconds requested is greater than # zero. # if {$milliseconds <= 0} then { |
︙ | ︙ | |||
2221 2222 2223 2224 2225 2226 2227 | # # NOTE: We need several of our test related commands in the global # namespace as well. # exportAndImportPackageCommands [namespace current] [list \ tputs tlog getSoftwareRegistryKey haveConstraint addConstraint \ haveOrAddConstraint getConstraints removeConstraint fixConstraints \ | | > | | | | | | | | > | | 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 | # # NOTE: We need several of our test related commands in the global # namespace as well. # exportAndImportPackageCommands [namespace current] [list \ tputs tlog getSoftwareRegistryKey haveConstraint addConstraint \ haveOrAddConstraint getConstraints removeConstraint fixConstraints \ calculateBogoCops calculateRelativePerformance formatTimeStamp \ formatElapsedTime sourceIfValid processTestArguments \ getTclShellFileName getTemporaryPath getFiles getTestFiles \ getTestRunId getTestLogId getTestLog getTestSuite getTestMachine \ getTestPlatform getTestConfiguration getTestSuffix testExec \ testClrExec execTestShell isRandomOrder isStopOnFailure \ isExitOnComplete returnInfoScript runTestPrologue runTestEpilogue \ hookPuts unhookPuts runTest testArrayGet testShim tsource \ recordTestStatistics reportTestStatistics formatList formatListAsDict \ pathToRegexp inverseLsearchGlob removePathFromFileNames formatDecimal \ clearTestPercent reportTestPercent runAllTests isTestSuiteRunning \ configureTcltest machineToPlatform getPassPercentage \ getSkipPercentage] false false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### } # # NOTE: Provide the Eagle test package to the interpreter. # package provide Eagle.Test \ [expr {[isEagle] ? [info engine PatchLevel] : "1.0"}] } |
Added Externals/Eagle/lib/Eagle1.0/word.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | # word.tcl -- # # This file defines various procedures for computing word boundaries # in strings. This file is primarily needed so Tk text and entry # widgets behave properly for different platforms. # # Copyright (c) 1996 by Sun Microsystems, Inc. # Copyright (c) 1998 by Scritpics Corporation. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # The following variables are used to determine which characters are # interpreted as white space. if {$::tcl_platform(platform) eq "windows"} { # Windows style - any but a unicode space char set tcl_wordchars "\\S" set tcl_nonwordchars "\\s" } else { # Motif style - any unicode word char (number, letter, or underscore) set tcl_wordchars "\\w" set tcl_nonwordchars "\\W" } # tcl_wordBreakAfter -- # # This procedure returns the index of the first word boundary # after the starting point in the given string, or -1 if there # are no more boundaries in the given string. The index returned refers # to the first character of the pair that comprises a boundary. # # Arguments: # str - String to search. # start - Index into string specifying starting point. proc tcl_wordBreakAfter {str start} { global tcl_nonwordchars tcl_wordchars set str [string range $str $start end] if {[regexp -indices "$tcl_wordchars$tcl_nonwordchars|$tcl_nonwordchars$tcl_wordchars" $str result]} { return [expr {[lindex $result 1] + $start}] } return -1 } # tcl_wordBreakBefore -- # # This procedure returns the index of the first word boundary # before the starting point in the given string, or -1 if there # are no more boundaries in the given string. The index returned # refers to the second character of the pair that comprises a boundary. # # Arguments: # str - String to search. # start - Index into string specifying starting point. proc tcl_wordBreakBefore {str start} { global tcl_nonwordchars tcl_wordchars if {$start eq "end"} { set start [string length $str] } if {[regexp -indices "^.*($tcl_wordchars$tcl_nonwordchars|$tcl_nonwordchars$tcl_wordchars)" [string range $str 0 $start] result]} { return [lindex $result 1] } return -1 } # tcl_endOfWord -- # # This procedure returns the index of the first end-of-word location # after a starting index in the given string. An end-of-word location # is defined to be the first whitespace character following the first # non-whitespace character after the starting point. Returns -1 if # there are no more words after the starting point. # # Arguments: # str - String to search. # start - Index into string specifying starting point. proc tcl_endOfWord {str start} { global tcl_nonwordchars tcl_wordchars if {[regexp -indices "$tcl_nonwordchars*$tcl_wordchars+$tcl_nonwordchars" \ [string range $str $start end] result]} { return [expr {[lindex $result 1] + $start}] } return -1 } # tcl_startOfNextWord -- # # This procedure returns the index of the first start-of-word location # after a starting index in the given string. A start-of-word # location is defined to be a non-whitespace character following a # whitespace character. Returns -1 if there are no more start-of-word # locations after the starting point. # # Arguments: # str - String to search. # start - Index into string specifying starting point. proc tcl_startOfNextWord {str start} { global tcl_nonwordchars tcl_wordchars if {[regexp -indices "$tcl_wordchars*$tcl_nonwordchars+$tcl_wordchars" \ [string range $str $start end] result]} { return [expr {[lindex $result 1] + $start}] } return -1 } # tcl_startOfPreviousWord -- # # This procedure returns the index of the first start-of-word location # before a starting index in the given string. # # Arguments: # str - String to search. # start - Index into string specifying starting point. proc tcl_startOfPreviousWord {str start} { global tcl_nonwordchars tcl_wordchars if {$start eq "end"} { set start [string length $str] } if {[regexp -indices \ "$tcl_nonwordchars*($tcl_wordchars+)$tcl_nonwordchars*\$" \ [string range $str 0 [expr {$start - 1}]] result word]} { return [lindex $word 0] } return -1 } |
Changes to Externals/Eagle/lib/Test1.0/constraints.eagle.
︙ | ︙ | |||
930 931 932 933 934 935 936 937 938 939 940 941 942 943 | addConstraint tip405 tputs $channel yes\n } else { tputs $channel no\n } } proc checkForTiming { channel threshold {constraint ""} {tries 1} {delay 1000} {asynchronous false} } { tputs $channel [appendArgs \ "---- checking for precision timing (threshold of " $threshold \ " milliseconds, delay of " $delay " milliseconds)... "] | > > > > > > > > > > > > > > > > > | 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 | addConstraint tip405 tputs $channel yes\n } else { tputs $channel no\n } } proc checkForTip426 { channel } { tputs $channel "---- checking for TIP #426... " # # NOTE: Is the interpreter TIP #426 ready? # catch {info cmdtype} error if {$error eq {wrong # args: should be "info cmdtype commandName"}} then { addConstraint tip426 tputs $channel yes\n } else { tputs $channel no\n } } proc checkForTiming { channel threshold {constraint ""} {tries 1} {delay 1000} {asynchronous false} } { tputs $channel [appendArgs \ "---- checking for precision timing (threshold of " $threshold \ " milliseconds, delay of " $delay " milliseconds)... "] |
︙ | ︙ | |||
1355 1356 1357 1358 1359 1360 1361 | tputs $channel no\n } } proc checkForHost { channel } { tputs $channel "---- checking for host... " | | > | | | > > > > > > > > | > > > > > | 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 | tputs $channel no\n } } proc checkForHost { channel } { tputs $channel "---- checking for host... " if {[catch {host isopen} result] == 0} then { if {$result} then { addConstraint hostIsOpen tputs $channel open\n } else { if {[catch {host redirected Input} result] == 0} then { if {$result} then { addConstraint hostInputRedirected tputs $channel redirected\n } else { addConstraint hostIsClosed tputs $channel closed\n } } else { tlog $result; tputs $channel error\n] } } } else { tlog $result; tputs $channel error\n] } } proc checkForHostType { channel } { tputs $channel "---- checking for host type... " |
︙ | ︙ | |||
2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 | tputs $channel [appendArgs $::eagle_platform(targetFramework) \ " " ( $targetFramework ) \n] } else { tputs $channel no\n } } proc checkForNetFx45 { channel } { tputs $channel "---- checking for .NET Framework 4.5... " # # NOTE: Platform must be Windows for this constraint to even be # checked (i.e. we require the registry). | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 | tputs $channel [appendArgs $::eagle_platform(targetFramework) \ " " ( $targetFramework ) \n] } else { tputs $channel no\n } } proc checkForNativeUtility { channel } { tputs $channel "---- checking for native utility... " if {[info exists ::eagle_platform(nativeUtility)] && \ [string length $::eagle_platform(nativeUtility)] > 0} then { set name [lindex $::eagle_platform(nativeUtility) 0] if {[string length $name] > 0} then { set version [lindex $::eagle_platform(nativeUtility) 1] if {[string length $version] > 0} then { set nativeUtility [appendArgs \ $name . [join [lrange [split $version .] 0 1] .]] } else { set nativeUtility $name } addConstraint [appendArgs nativeUtility. $nativeUtility] tputs $channel [appendArgs $::eagle_platform(nativeUtility) \ " " ( $nativeUtility ) \n] } else { tputs $channel unknown\n } } else { tputs $channel no\n } } proc checkForNetFx45 { channel } { tputs $channel "---- checking for .NET Framework 4.5... " # # NOTE: Platform must be Windows for this constraint to even be # checked (i.e. we require the registry). |
︙ | ︙ | |||
2506 2507 2508 2509 2510 2511 2512 | checkForScriptLibrary checkForVariable checkForTclOptions \ checkForWindowsCommandProcessor checkForFossil checkForEagle \ checkForSymbols checkForLogFile checkForGaruda checkForShell \ checkForDebug checkForTk checkForVersion checkForCommand \ checkForTestMachine checkForTestPlatform checkForTestConfiguration \ checkForTestSuffix checkForFile checkForPathFile checkForNativeCode \ checkForTip127 checkForTip194 checkForTip241 checkForTip285 \ | | | 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 | checkForScriptLibrary checkForVariable checkForTclOptions \ checkForWindowsCommandProcessor checkForFossil checkForEagle \ checkForSymbols checkForLogFile checkForGaruda checkForShell \ checkForDebug checkForTk checkForVersion checkForCommand \ checkForTestMachine checkForTestPlatform checkForTestConfiguration \ checkForTestSuffix checkForFile checkForPathFile checkForNativeCode \ checkForTip127 checkForTip194 checkForTip241 checkForTip285 \ checkForTip405 checkForTip426 checkForTiming checkForPerformance \ checkForStackIntensive checkForInteractive checkForInteractiveCommand \ checkForUserInteraction checkForNetwork checkForCompileOption] false \ false ########################################################################### ############################## END Tcl ONLY ############################### ########################################################################### |
︙ | ︙ |
Changes to Externals/Eagle/lib/Test1.0/epilogue.eagle.
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | # # NOTE: Check the name of the current call frame against the one # that should be used for evaluating this script file. # if {[object invoke -flags +NonPublic \ Interpreter.GetActive.CurrentFrame Name] ne \ [appendArgs source " " [file normalize [info script]]]} then { error "cannot run, current frame is not for this script" } } # # NOTE: Make sure all the variables used by this epilogue are unset. # unset -nocomplain memory stack name count passedOrSkipped percent \ exitCode # # NOTE: Show when the tests actually ended (now). # tputs $test_channel [appendArgs "---- tests ended at " \ | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | # # NOTE: Check the name of the current call frame against the one # that should be used for evaluating this script file. # if {[object invoke -flags +NonPublic \ Interpreter.GetActive.CurrentFrame Name] ne \ [appendArgs source " " [file normalize [info script]]]} then { unset -nocomplain test_suite_running error "cannot run, current frame is not for this script" } } # # NOTE: Make sure all the variables used by this epilogue are unset. # unset -nocomplain memory stack name count passedOrSkipped percent \ exitCode # # NOTE: Show when the tests actually ended (now). # tputs $test_channel [appendArgs "---- tests ended at " \ [formatTimeStamp [set test_timestamp(endSeconds) \ [clock seconds]]] \n] # # NOTE: We can only calculate the elapsed seconds for the tests if # the necessary variables exist and contain valid values. # if {[info exists test_timestamp(startSeconds)] && \ [string is integer -strict $test_timestamp(startSeconds)] && \ [info exists test_timestamp(endSeconds)] && \ [string is integer -strict $test_timestamp(endSeconds)]} then { # # NOTE: First, figure out how many whole seconds elapsed during # roughly the entire testing process (which is rougly the # same time taken to just run the tests themselves). # set test_timestamp(elapsedSeconds) [expr \ {$test_timestamp(endSeconds) - $test_timestamp(startSeconds)}] # # NOTE: Show (and log) the number of elapsed seconds and possibly # a human readable elapsed time string as well. # tputs $test_channel [appendArgs "---- tests took approximately " \ [formatElapsedTime $test_timestamp(elapsedSeconds)] \n] } # # NOTE: Show the ending command count (for both Tcl and Eagle). # tputs $test_channel [appendArgs "---- ending command count: " \ [info cmdcount] \n] if {[isEagle]} then { # # NOTE: We can only calculate the elapsed microseconds for the tests # if the necessary variables exist and contain valid values. # if {[info exists test_timestamp(startCount)] && \ [string is wideinteger -strict $test_timestamp(startCount)]} then { # # NOTE: First, figure out how many microseconds elapsed during # roughly the entire testing process (which is rougly the # same time taken to just run the tests themselves). # catch { set test_timestamp(elapsedMicroseconds) \ [clock stop $test_timestamp(startCount)] } # # NOTE: Show the approximate number of elapsed microseconds. # if {[info exists test_timestamp(elapsedMicroseconds)] && [string \ is double -strict $test_timestamp(elapsedMicroseconds)]} then { tputs $test_channel [appendArgs "---- tests took approximately " \ [formatDecimal $test_timestamp(elapsedMicroseconds)] \ " microseconds\n"] } } # # NOTE: Show the ending operation count (for Eagle only). # tputs $test_channel [appendArgs "---- ending operation count: " \ [object invoke -flags +NonPublic Interpreter.GetActive \ OperationCount] \n] |
︙ | ︙ | |||
85 86 87 88 89 90 91 | # # NOTE: Check for and display any duplicate test names that we found. In # theory, this checking may produce false positives if a test file # (or the entire test suite) is run multiple times without resetting # the test statistics and/or restarting Eagle; however, duplicate # test names must be avoided and this is considered a good trade-off. # | | | | | | | | | | | | | | | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | # # NOTE: Check for and display any duplicate test names that we found. In # theory, this checking may produce false positives if a test file # (or the entire test suite) is run multiple times without resetting # the test statistics and/or restarting Eagle; however, duplicate # test names must be avoided and this is considered a good trade-off. # foreach {name count} $eagle_tests(Counts) { if {$count > 1} then { tputs $test_channel [appendArgs \ "==== test name \"" $name "\" DUPLICATED (" $count ")\n"] } elseif {$count <= 0} then { tputs $test_channel [appendArgs \ "==== test name \"" $name "\" BAD COUNT (" $count ")\n"] } } unset -nocomplain name count tputs $test_channel \n; # NOTE: Blank line. if {$eagle_tests(Passed) > 0} then { tresult Ok [appendArgs "PASSED: " $eagle_tests(Passed) \n] } if {$eagle_tests(Failed) > 0} then { tresult Error [appendArgs "FAILED: " $eagle_tests(Failed) \n] if {[llength $eagle_tests(FailedNames)] > 0} then { tresult Error [appendArgs "FAILED: " $eagle_tests(FailedNames) \n] } } if {$eagle_tests(Skipped) > 0} then { tresult Break [appendArgs "SKIPPED: " $eagle_tests(Skipped) \n] if {[llength $eagle_tests(SkippedNames)] > 0} then { tresult Break [appendArgs "SKIPPED: " $eagle_tests(SkippedNames) \n] } } if {$eagle_tests(Total) > 0} then { tresult Return [appendArgs "TOTAL: " $eagle_tests(Total) \n] if {$eagle_tests(Skipped) > 0} then { set percent [getSkipPercentage] tresult Break [appendArgs \ "SKIP PERCENTAGE: " [formatDecimal $percent] %\n] } set percent [getPassPercentage] |
︙ | ︙ | |||
150 151 152 153 154 155 156 | # if {![info exists test_threshold] || $test_threshold == 100} then { # # NOTE: The test pass threshold is set to the default value (100%). # Check to make sure that all tests pass and then set the # exit code to success; otherwise, we set it to failure. # | | | | | | | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | # if {![info exists test_threshold] || $test_threshold == 100} then { # # NOTE: The test pass threshold is set to the default value (100%). # Check to make sure that all tests pass and then set the # exit code to success; otherwise, we set it to failure. # set passedOrSkipped [expr {$eagle_tests(Passed) + \ $eagle_tests(Skipped)}] if {$passedOrSkipped == $eagle_tests(Total)} then { set exitCode Success if {$eagle_tests(Total) > 0} then { tresult Ok "OVERALL RESULT: SUCCESS\n" } else { tresult Ok "OVERALL RESULT: NONE\n" } } else { set exitCode Failure tresult Error "OVERALL RESULT: FAILURE\n" } unset passedOrSkipped } else { # # NOTE: They specified a non-default test pass threshold. Check to # make sure that we meet or exceed the requirement and then # set the exit code to success; otherwise, set it to failure. # if {$percent >= $test_threshold} then { set exitCode Success if {$eagle_tests(Total) > 0} then { tresult Ok [appendArgs \ "OVERALL RESULT: SUCCESS (" $percent "% >= " $test_threshold %)\n] } else { tresult Ok [appendArgs \ "OVERALL RESULT: NONE (" $percent "% >= " $test_threshold %)\n] } } else { |
︙ | ︙ | |||
295 296 297 298 299 300 301 | "OVERALL RESULT: FAILURE (" $percent "% < " $test_threshold %)\n] } } unset percent tputs $test_channel \n; # NOTE: Blank line. | | | > | | | | | < | 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 | "OVERALL RESULT: FAILURE (" $percent "% < " $test_threshold %)\n] } } unset percent tputs $test_channel \n; # NOTE: Blank line. } # # NOTE: Call the Tcl test cleanup procedure now to give it a chance to do # any custom cleanup that has been registered. # ::tcltest::cleanupTests # # NOTE: Check for and process any custom test epilogue script that may # be set in the environment. # sourceIfValid epilogue [getEnvironmentVariable testEpilogue] # |
︙ | ︙ | |||
337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | # # NOTE: The post-test script failed in some way. This is considered # to be an overall failure of the test suite; therefore, raise # the error now that we are sure it has been recorded in the # test log file. # error $test_script(post,result) } } } # # NOTE: Do we need to exit now? # if {[isExitOnComplete]} then { # # NOTE: Exit now. In Eagle, this will not exit the entire process. | > > > > > > > > | 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 | # # NOTE: The post-test script failed in some way. This is considered # to be an overall failure of the test suite; therefore, raise # the error now that we are sure it has been recorded in the # test log file. # unset -nocomplain test_suite_running error $test_script(post,result) } } } # # NOTE: Indicate that the test suite is no longer running. # if {[info exists test_suite_running] && $test_suite_running} then { set test_suite_running false } # # NOTE: Do we need to exit now? # if {[isExitOnComplete]} then { # # NOTE: Exit now. In Eagle, this will not exit the entire process. |
︙ | ︙ |
Changes to Externals/Eagle/lib/Test1.0/prologue.eagle.
︙ | ︙ | |||
20 21 22 23 24 25 26 | } # # NOTE: Make sure all the variables used by this prologue are unset. # unset -nocomplain pkg_dir pattern exec dummy directory name value expr \ publicKeyToken encoding memory stack drive server database timeout \ | | > > > > > > > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | } # # NOTE: Make sure all the variables used by this prologue are unset. # unset -nocomplain pkg_dir pattern exec dummy directory name value expr \ publicKeyToken encoding memory stack drive server database timeout \ user password percent checkout timeStamp loaded # # NOTE: Indicate that the test suite is currently running. # if {![info exists test_suite_running] || !$test_suite_running} then { set test_suite_running true } # # NOTE: Set the location of the test suite, if necessary. # if {![info exists test_path]} then { set test_path [file normalize [file dirname [info script]]] } |
︙ | ︙ | |||
227 228 229 230 231 232 233 234 235 236 237 238 239 240 | # # NOTE: Check the name of the current call frame against the one # that should be used for evaluating this script file. # if {[object invoke -flags +NonPublic \ Interpreter.GetActive.CurrentFrame Name] ne \ [appendArgs source " " [file normalize [info script]]]} then { error "cannot run, current frame is not for this script" } } ############################################################################# # | > | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | # # NOTE: Check the name of the current call frame against the one # that should be used for evaluating this script file. # if {[object invoke -flags +NonPublic \ Interpreter.GetActive.CurrentFrame Name] ne \ [appendArgs source " " [file normalize [info script]]]} then { unset -nocomplain test_suite_running error "cannot run, current frame is not for this script" } } ############################################################################# # |
︙ | ︙ | |||
407 408 409 410 411 412 413 414 415 416 417 418 419 420 | # if {![info exists test_log]} then { set test_log [file join [getTemporaryPath] [appendArgs [file tail [info \ nameofexecutable]] [getTestLogId] .test. [pid] .log]] } } # # NOTE: Show both the pre-test and post-test scripts now, prior to actually # evaluating either of them (even if their use has been disabled). # tputs $test_channel [appendArgs "---- pre-test script: " \ [expr {[info exists test_script(pre)] && \ [string length $test_script(pre)] > 0 ? \ | > > > > > > > > > > > > > > > > > > > > > > | 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 | # if {![info exists test_log]} then { set test_log [file join [getTemporaryPath] [appendArgs [file tail [info \ nameofexecutable]] [getTestLogId] .test. [pid] .log]] } } # # NOTE: When running in Eagle, check for any non-core plugins loaded into # the interpreter and issue warnings if any are found. The warning # may be used to explain subsequent test failures due to the extra # plugins being loaded (i.e. there are some tests are sensitive to # having "unexpected" plugins loaded). # if {[isEagle]} then { foreach loaded [info loaded] { # # HACK: This code assumes that all plugins in the "Eagle._Plugins" # namespace belong to the Eagle core library itself. # if {![string match Eagle._Plugins.* [lindex $loaded 1]]} then { tputs $test_channel [appendArgs \ "==== WARNING: extra plugin found: " $loaded \n] } } unset -nocomplain loaded } # # NOTE: Show both the pre-test and post-test scripts now, prior to actually # evaluating either of them (even if their use has been disabled). # tputs $test_channel [appendArgs "---- pre-test script: " \ [expr {[info exists test_script(pre)] && \ [string length $test_script(pre)] > 0 ? \ |
︙ | ︙ | |||
449 450 451 452 453 454 455 456 457 458 459 460 461 462 | # # NOTE: The pre-test script failed in some way. This is considered # to be an overall failure of the test suite; therefore, raise # the error now that we are sure it has been recorded in the # test log file. # error $test_script(pre,result) } } } # # NOTE: Check for and process any custom test prologue script that may be set | > | 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | # # NOTE: The pre-test script failed in some way. This is considered # to be an overall failure of the test suite; therefore, raise # the error now that we are sure it has been recorded in the # test log file. # unset -nocomplain test_suite_running error $test_script(pre,result) } } } # # NOTE: Check for and process any custom test prologue script that may be set |
︙ | ︙ | |||
553 554 555 556 557 558 559 560 561 562 563 564 565 566 | catch {object invoke Console.OutputEncoding WebName} encoding tputs $test_channel [appendArgs "---- output encoding: " \ $encoding \n] unset encoding catch {debug memory} memory tputs $test_channel [appendArgs "---- starting memory: " \ [formatListAsDict $memory] \n] unset memory catch {debug stack true} stack | > > > > > > | 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 | catch {object invoke Console.OutputEncoding WebName} encoding tputs $test_channel [appendArgs "---- output encoding: " \ $encoding \n] unset encoding catch {host query} host tputs $test_channel [appendArgs "---- host query: " \ [formatListAsDict $host] \n] unset host catch {debug memory} memory tputs $test_channel [appendArgs "---- starting memory: " \ [formatListAsDict $memory] \n] unset memory catch {debug stack true} stack |
︙ | ︙ | |||
663 664 665 666 667 668 669 | tputs $test_channel [appendArgs "---- disabled options: " \ [formatList [lsort [array names no]] <none>] \n] # # NOTE: Initialize the Eagle test constraints. # if {[isEagle]} then { | | | 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 | tputs $test_channel [appendArgs "---- disabled options: " \ [formatList [lsort [array names no]] <none>] \n] # # NOTE: Initialize the Eagle test constraints. # if {[isEagle]} then { initializeTests; configureTcltest [list] [list] false # # NOTE: If the "no(mono)" variable is set (to anything) then any # special test suite hacks for Mono will be disabled. This # does not control or change any hacks for Mono that may # be present in the library itself. # |
︙ | ︙ | |||
924 925 926 927 928 929 930 931 932 933 934 935 936 937 | # if {![info exists no(compileCallbackQueue)]} then { # # NOTE: For test "commands-1.4". # checkForCompileOption $test_channel CALLBACK_QUEUE } # # NOTE: Has console support been enabled (at compile-time)? # if {![info exists no(compileConsole)]} then { # # NOTE: For test "host-1.2". | > > > > > > > > > > | 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 | # if {![info exists no(compileCallbackQueue)]} then { # # NOTE: For test "commands-1.4". # checkForCompileOption $test_channel CALLBACK_QUEUE } # # NOTE: Has legacy CAS policy support been enabled (at compile-time)? # if {![info exists no(compileCasPolicy)]} then { # # NOTE: For tests "load-1.6" and "load-1.7". # checkForCompileOption $test_channel CAS_POLICY } # # NOTE: Has console support been enabled (at compile-time)? # if {![info exists no(compileConsole)]} then { # # NOTE: For test "host-1.2". |
︙ | ︙ | |||
1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 | # # NOTE: For tests "basic-1.46" and "basic-1.47". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestScriptStream* } # # NOTE: Has DateTime testing support been disabled? # if {![info exists no(testDateTime)]} then { # # NOTE: For test "vwait-1.11". # | > > > > > > > > | 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 | # # NOTE: For tests "basic-1.46" and "basic-1.47". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestScriptStream* } if {![info exists no(testLoad)]} then { # # NOTE: For tests "load-1.6" and "load-1.7". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestLoadPluginViaBytes* } # # NOTE: Has DateTime testing support been disabled? # if {![info exists no(testDateTime)]} then { # # NOTE: For test "vwait-1.11". # |
︙ | ︙ | |||
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 | checkForObjectMember $test_channel Eagle._Tests.Default \ *TestMulti3Array* checkForObjectMember $test_channel Eagle._Tests.Default \ *TestNestedArray* # # NOTE: For tests "object-3.6" and "object-3.7". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestStringIListReturnValue* checkForObjectMember $test_channel Eagle._Tests.Default \ | > > > > > > | 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 | checkForObjectMember $test_channel Eagle._Tests.Default \ *TestMulti3Array* checkForObjectMember $test_channel Eagle._Tests.Default \ *TestNestedArray* # # NOTE: For test "object-2.11". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestObjectAsArray* # # NOTE: For tests "object-3.6" and "object-3.7". # checkForObjectMember $test_channel Eagle._Tests.Default \ *TestStringIListReturnValue* checkForObjectMember $test_channel Eagle._Tests.Default \ |
︙ | ︙ | |||
1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 | # # NOTE: Has target framework testing support been disabled? # if {![info exists no(targetFramework)]} then { checkForTargetFramework $test_channel } # # NOTE: Has Visual Studio testing support been disabled? # if {![info exists no(visualStudio)]} then { checkForVisualStudio $test_channel } | > > > > > > > | 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 | # # NOTE: Has target framework testing support been disabled? # if {![info exists no(targetFramework)]} then { checkForTargetFramework $test_channel } # # NOTE: Has native utility testing support been disabled? # if {![info exists no(nativeUtility)]} then { checkForNativeUtility $test_channel } # # NOTE: Has Visual Studio testing support been disabled? # if {![info exists no(visualStudio)]} then { checkForVisualStudio $test_channel } |
︙ | ︙ | |||
1805 1806 1807 1808 1809 1810 1811 | # # NOTE: Has checking for the extra files needed by various tests been # disabled? # if {![info exists no(checkForFile)]} then { # | | | | | 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 | # # NOTE: Has checking for the extra files needed by various tests been # disabled? # if {![info exists no(checkForFile)]} then { # # NOTE: For test "garuda-1.1". # if {![info exists no(pkgAll.tcl)]} then { checkForFile $test_channel [file join $base_path Native Package \ Tests all.tcl] pkgAll.tcl } # # NOTE: For tests "subst-1.*". # if {![info exists no(bad_subst.txt)]} then { checkForFile $test_channel [file join $test_path bad_subst.txt] |
︙ | ︙ | |||
2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 | checkForTip285 $test_channel } if {![info exists no(tip405)]} then { checkForTip405 $test_channel } # # NOTE: Has performance testing been disabled? # if {![info exists no(performance)]} then { checkForPerformance $test_channel } | > > > > | 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 | checkForTip285 $test_channel } if {![info exists no(tip405)]} then { checkForTip405 $test_channel } if {![info exists no(tip426)]} then { checkForTip426 $test_channel } # # NOTE: Has performance testing been disabled? # if {![info exists no(performance)]} then { checkForPerformance $test_channel } |
︙ | ︙ | |||
2314 2315 2316 2317 2318 2319 2320 | if {[isMono]} then { # # HACK: We need something to go into the log file. # set timeStamp [lindex $timeStamp 0] } else { | | | 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 | if {[isMono]} then { # # HACK: We need something to go into the log file. # set timeStamp [lindex $timeStamp 0] } else { set timeStamp [formatTimeStamp [clock scan $timeStamp]] } } else { set timeStamp <none> } tputs $test_channel [appendArgs "---- build: " \ [list [getPlatformInfo engine <none>]] " " \ |
︙ | ︙ | |||
2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 | if {[isEagle]} then { # # NOTE: Show the starting operation count (for Eagle only). # tputs $test_channel [appendArgs "---- starting operation count: " \ [object invoke -flags +NonPublic Interpreter.GetActive \ OperationCount] \n] } # # NOTE: Show when the tests actually began (now). # | > > > > > > | > | | 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 | if {[isEagle]} then { # # NOTE: Show the starting operation count (for Eagle only). # tputs $test_channel [appendArgs "---- starting operation count: " \ [object invoke -flags +NonPublic Interpreter.GetActive \ OperationCount] \n] # # NOTE: Record the raw starting performance count, for later use in # calculating the approximate number of microseconds elapsed. # catch {set test_timestamp(startCount) [clock start]} } # # NOTE: Show when the tests actually began (now). # tputs $test_channel [appendArgs "---- tests started at " \ [formatTimeStamp [set test_timestamp(startSeconds) \ [clock seconds]]] \n] } |