Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch testNativeLibraryPreLoader Excluding Merge-Ins
This is equivalent to a diff from 2f18d24bcc to 54d66e2b47
|
2013-12-27
| ||
| 04:56 | Fix duplicate test name. check-in: b114eb4fbe user: mistachkin tags: trunk | |
| 04:03 | Merge testing changes. Rename the XML configuration file to 'System.Data.SQLite.dll.config'. Break out shared native library pre-loading code to fix compilation issues. check-in: c43afb58ea user: mistachkin tags: refactorNativeLibraryPreLoader | |
|
2013-12-26
| ||
| 04:01 | Refactor native library pre-loading code to be more flexible. check-in: 77a0e66f10 user: mistachkin tags: refactorNativeLibraryPreLoader | |
| 03:57 | Enhance the test suite infrastructure to support easier testing of the native library pre-loading code. Closed-Leaf check-in: 54d66e2b47 user: mistachkin tags: testNativeLibraryPreLoader | |
| 00:57 | Fix HTML entity escaping in the environment variable documentation page. check-in: 2f18d24bcc user: mistachkin tags: trunk | |
|
2013-12-24
| ||
| 06:47 | Final updates for release 1.0.90.0. check-in: 4c0e02e361 user: mistachkin tags: trunk, release, release-1.0.90.0 | |
Changes to Tests/common.eagle.
| ︙ | ︙ | |||
497 498 499 500 501 502 503 |
#
# NOTE: No release version is available, return an empty string.
#
return ""
}
}
| | | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 |
#
# NOTE: No release version is available, return an empty string.
#
return ""
}
}
proc getBuildFileName { fileName {platform ""} } {
#
# NOTE: Returns the specified file name as if it were located in the
# build directory, discarding any directory information present
# in the file name as provided by our caller.
#
return [file nativename \
[file join [getBuildDirectory] $platform [file tail $fileName]]]
}
proc getBinaryDirectory {} {
#
# NOTE: This procedure returns the directory where the test application
# itself (i.e. the Eagle shell) is located. This will be used as
# the destination for the copied System.Data.SQLite native and
|
| ︙ | ︙ | |||
527 528 529 530 531 532 533 |
#
return $::binary_directory
} else {
return [info binary]
}
}
| | | | | | | | 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 |
#
return $::binary_directory
} else {
return [info binary]
}
}
proc getBinaryFileName { fileName {platform ""} } {
#
# NOTE: Returns the specified file name as if it were located in the
# binary directory, discarding any directory information present
# in the file name as provided by our caller.
#
return [file nativename \
[file join [getBinaryDirectory] $platform [file tail $fileName]]]
}
proc getCoreBinaryFileName { {platform ""} {standard false} } {
#
# NOTE: Returns the full path for the file containing the core SQLite
# library code for this platform.
#
if {[hasRuntimeOption native]} then {
#
# NOTE: Return the mixed-mode assembly file name.
#
return [file nativename \
[file join [getBinaryDirectory] $platform System.Data.SQLite.dll]]
} elseif {$standard} then {
#
# NOTE: Return the native-only standard SQLite library file name.
#
return [file nativename \
[file join [getBinaryDirectory] $platform sqlite3.dll]]
} else {
#
# NOTE: Return the native-only interop assembly file name.
#
return [file nativename \
[file join [getBinaryDirectory] $platform 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
|
| ︙ | ︙ | |||
739 740 741 742 743 744 745 |
return [uplevel 1 [list subst [appendArgs $prefix {
if {[hasRuntimeOption native]} then {
object invoke Interpreter.GetActive AddRuntimeOption native
}
} [getTestOverridesPreamble [list path test_channel]] $suffix]]]
}
| | | | | | | | | | | | | | | | > | | | > | | | 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 |
return [uplevel 1 [list subst [appendArgs $prefix {
if {[hasRuntimeOption native]} then {
object invoke Interpreter.GetActive AddRuntimeOption native
}
} [getTestOverridesPreamble [list path test_channel]] $suffix]]]
}
proc tryCopyBinaryFile { fileName {platform ""} {newFileName ""} } {
set sourceFileName [getBinaryFileName $fileName $platform]
if {![file exists $sourceFileName]} then {
tputs $::test_channel [appendArgs \
"---- skipped copying binary file \"" $sourceFileName \
"\", it does not exist\n"]
return
}
if {[string length $newFileName] > 0} then {
set targetFileName [getBuildFileName $newFileName $platform]
} else {
set targetFileName [getBuildFileName $fileName $platform]
}
if {[catch {
file copy -force $sourceFileName $targetFileName}] == 0} then {
tputs $::test_channel [appendArgs \
"---- copied binary file from \"" $sourceFileName "\" to \"" \
$targetFileName \"\n]
} else {
tputs $::test_channel [appendArgs \
"---- failed to copy binary file from \"" $sourceFileName \
"\" to \"" $targetFileName \"\n]
}
}
proc tryCopyBuildFile { fileName {platform ""} {newFileName ""} } {
set sourceFileName [getBuildFileName $fileName $platform]
if {![file exists $sourceFileName]} then {
tputs $::test_channel [appendArgs \
"---- skipped copying build file \"" $sourceFileName \
"\", it does not exist\n"]
return
}
if {[string length $newFileName] > 0} then {
set targetFileName [getBinaryFileName $newFileName $platform]
} else {
set targetFileName [getBinaryFileName $fileName $platform]
}
if {[catch {
file copy -force $sourceFileName $targetFileName}] == 0} then {
tputs $::test_channel [appendArgs \
"---- copied build file from \"" $sourceFileName "\" to \"" \
$targetFileName \"\n]
} else {
tputs $::test_channel [appendArgs \
"---- failed to copy build file from \"" $sourceFileName \
"\" to \"" $targetFileName \"\n]
}
}
proc tryDeleteBinaryFile { fileName {platform ""} } {
set fileName [getBinaryFileName $fileName $platform]
if {![file exists $fileName]} then {
tputs $::test_channel [appendArgs \
"---- skipped deleting binary file \"" $fileName \
"\", it does not exist\n"]
return
}
if {[catch {file delete $fileName}] == 0} then {
tputs $::test_channel [appendArgs \
"---- deleted binary file \"" $fileName \"\n]
} else {
tputs $::test_channel [appendArgs \
"---- failed to delete binary file \"" $fileName \"\n]
}
}
proc tryDeleteBuildFile { fileName {platform ""} } {
set fileName [getBuildFileName $fileName $platform]
if {![file exists $fileName]} then {
tputs $::test_channel [appendArgs \
"---- skipped deleting build file \"" $fileName \
"\", it does not exist\n"]
return
}
if {[catch {file delete $fileName}] == 0} then {
tputs $::test_channel [appendArgs \
"---- deleted build file \"" $fileName \"\n]
} else {
tputs $::test_channel [appendArgs \
"---- failed to delete build file \"" $fileName \"\n]
}
}
proc tryCopyAssembly { fileName {platform ""} {pdb true} } {
tryCopyBuildFile $fileName $platform
if {$pdb} then {
tryCopyBuildFile [appendArgs \
[file rootname $fileName] .pdb] $platform
}
}
proc tryDeleteAssembly { fileName {platform ""} {pdb true} } {
tryDeleteBinaryFile $fileName $platform
if {$pdb} then {
tryDeleteBinaryFile [appendArgs \
[file rootname $fileName] .pdb] $platform
}
}
proc tryLoadAssembly { fileName {platform ""} } {
set fileName [getBinaryFileName $fileName $platform]
if {[catch {set assembly \
[object load -loadtype File -alias $fileName]}] == 0} then {
#
# NOTE: Now, add the necessary test constraint.
#
addConstraint [file rootname [file tail $fileName]]
|
| ︙ | ︙ | |||
2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 |
uplevel 1 [list loadSQLiteTestSettings $::test_channel .before]
#
# NOTE: Skip all System.Data.SQLite related file handling (deleting,
# copying, and loading) if we are so instructed.
#
if {![info exists ::no(sqliteFiles)]} then {
#
# NOTE: Skip trying to delete any files if we are so instructed.
#
if {![info exists ::no(deleteSqliteFiles)]} then {
tryDeleteAssembly sqlite3.dll
| > > > > > | > > > > | | | | | | | | 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 |
uplevel 1 [list loadSQLiteTestSettings $::test_channel .before]
#
# NOTE: Skip all System.Data.SQLite related file handling (deleting,
# copying, and loading) if we are so instructed.
#
if {![info exists ::no(sqliteFiles)]} then {
#
# NOTE: Determine the name for the current native platform.
#
set platform [getBuildPlatform true]
#
# NOTE: Skip trying to delete any files if we are so instructed.
#
if {![info exists ::no(deleteSqliteFiles)]} then {
tryDeleteAssembly sqlite3.dll
tryDeleteAssembly SQLite.Interop.dll
tryDeleteAssembly System.Data.SQLite.dll
tryDeleteAssembly System.Data.SQLite.Linq.dll
if {[string length $platform] > 0} then {
tryDeleteAssembly sqlite3.dll $platform
tryDeleteAssembly SQLite.Interop.dll $platform
tryDeleteAssembly System.Data.SQLite.dll $platform
}
removeConstraint file_sqlite3.dll
removeConstraint file_SQLite.Interop.dll
removeConstraint file_System.Data.SQLite.dll
removeConstraint file_System.Data.SQLite.Linq.dll
}
#
# NOTE: Check for the "autoSelect" runtime option. If present,
# attempt to automatically select the first available
# build (or "release") of SQLite and System.Data.SQLite
|
| ︙ | ︙ | |||
2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 |
# NOTE: Skip trying to copy any files if we are so instructed.
#
if {![info exists ::no(copySqliteFiles)]} then {
tryCopyAssembly sqlite3.dll
tryCopyAssembly SQLite.Interop.dll
tryCopyAssembly System.Data.SQLite.dll
tryCopyAssembly System.Data.SQLite.Linq.dll
}
#
# NOTE: Skip trying to load any files if we are so instructed.
#
if {![info exists ::no(loadSqliteFiles)]} then {
tryLoadAssembly System.Data.SQLite.dll
tryLoadAssembly System.Data.SQLite.Linq.dll
| > > > > > > | > > | > > > > > > > > > > | | < > | | > | > | < > | | > | 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 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 |
# NOTE: Skip trying to copy any files if we are so instructed.
#
if {![info exists ::no(copySqliteFiles)]} then {
tryCopyAssembly sqlite3.dll
tryCopyAssembly SQLite.Interop.dll
tryCopyAssembly System.Data.SQLite.dll
tryCopyAssembly System.Data.SQLite.Linq.dll
if {[string length $platform] > 0} then {
tryCopyAssembly sqlite3.dll $platform
tryCopyAssembly SQLite.Interop.dll $platform
tryCopyAssembly System.Data.SQLite.dll $platform
}
}
#
# NOTE: Skip trying to load any files if we are so instructed.
#
if {![info exists ::no(loadSqliteFiles)]} then {
tryLoadAssembly System.Data.SQLite.dll
tryLoadAssembly System.Data.SQLite.Linq.dll
if {[string length $platform] > 0} then {
tryLoadAssembly System.Data.SQLite.dll $platform
}
}
#
# NOTE: Build a list of auxiliary Managed Debugging Assistants (MDA)
# configuration files that may need to be deleted or copied.
#
set mdaConfigFileNames [list \
Installer.exe.mda.config test.exe.mda.config \
testlinq.exe.mda.config]
#
# NOTE: Skip trying to delete external files if we are so instructed.
#
if {![info exists ::no(deleteSqliteExternalFiles)]} then {
foreach mdaConfigFileName $mdaConfigFileNames {
tryDeleteBuildFile $mdaConfigFileName
}
}
#
# NOTE: Skip trying to copy external files if we are so instructed.
#
if {![info exists ::no(copySqliteExternalFiles)]} then {
#
# NOTE: Copy the Managed Debugging Assistants (MDA) configuration
# file for the Eagle shell to the build output directory,
# while using each of the names of the various legacy test
# executables. This will help to make sure that all the
# legacy tests run with exactly the same set of Managed
# Debugging Assistants configured.
#
foreach mdaConfigFileName $mdaConfigFileNames {
tryCopyBinaryFile \
EagleShell.exe.mda.config "" $mdaConfigFileName
}
}
}
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"sqlite3.dll\"... " \
[file version [getBinaryFileName sqlite3.dll]] \n]
|
| ︙ | ︙ | |||
2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 |
}
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"System.Data.SQLite.Linq.dll\"... " \
[file version [getBinaryFileName System.Data.SQLite.Linq.dll]] \n]
}
set assemblies [object invoke AppDomain.CurrentDomain GetAssemblies]
object foreach assembly $assemblies {
if {[string match \{System.Data.SQLite* $assembly]} then {
tputs $::test_channel [appendArgs \
"---- found assembly: " $assembly \n]
| > > > > > > > > > > > > > > > > > > > > > > > | 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 |
}
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"System.Data.SQLite.Linq.dll\"... " \
[file version [getBinaryFileName System.Data.SQLite.Linq.dll]] \n]
}
if {[string length $platform] > 0} then {
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"" $platform \
"/sqlite3.dll\"... " [file version \
[getBinaryFileName sqlite3.dll $platform]] \n]
}
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"" $platform \
"/SQLite.Interop.dll\"... " [file version \
[getBinaryFileName SQLite.Interop.dll $platform]] \n]
}
catch {
tputs $::test_channel [appendArgs \
"---- file version of \"" $platform \
"/System.Data.SQLite.dll\"... " [file version \
[getBinaryFileName System.Data.SQLite.dll $platform]] \n]
}
}
set assemblies [object invoke AppDomain.CurrentDomain GetAssemblies]
object foreach assembly $assemblies {
if {[string match \{System.Data.SQLite* $assembly]} then {
tputs $::test_channel [appendArgs \
"---- found assembly: " $assembly \n]
|
| ︙ | ︙ |