Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Preliminary work on getting the test suite to run under Mono on Unix. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
085a9f8b8f78893c569b06bb09c94cb7 |
User & Date: | mistachkin 2016-03-21 21:46:48.243 |
Context
2016-03-22
| ||
00:29 | Simplify checking for test results that contain exception error messages. check-in: 8732a87f79 user: mistachkin tags: trunk | |
2016-03-21
| ||
21:46 | Preliminary work on getting the test suite to run under Mono on Unix. check-in: 085a9f8b8f user: mistachkin tags: trunk | |
16:15 | Centralize save/restore handling (in the test suite) for environment variables. Stop leaking a variable in tests data-1.79 and data-1.80. check-in: 7d3501975e user: mistachkin tags: trunk | |
Changes
Changes to Externals/Eagle/lib/Eagle1.0/vendor.eagle.
︙ | ︙ | |||
333 334 335 336 337 338 339 | # # NOTE: Check for any overridden settings that may have been specified via # the command line, etc. # checkForTestOverrides stdout [expr {[info exists test_overrides] ? \ $test_overrides : [list binary_directory build_base_directory \ build_directory common_directory connection_flags database_directory \ | | | | > | | | | | 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 | # # NOTE: Check for any overridden settings that may have been specified via # the command line, etc. # checkForTestOverrides stdout [expr {[info exists test_overrides] ? \ $test_overrides : [list binary_directory build_base_directory \ build_directory common_directory connection_flags database_directory \ datetime_format execute_on_setup native_library_file_names \ release_version scratch_directory temporary_directory test_clr \ test_clr_v2 test_clr_v4 test_configuration test_configurations \ test_constraints test_machine test_net_fx test_net_fx_2005 \ test_net_fx_2008 test_net_fx_2010 test_net_fx_2012 test_net_fx_2013 \ test_net_fx_2015 test_overrides test_platform test_suite test_year \ test_years test_year_clr_v2 test_year_clr_v4 vendor_directory \ vendor_test_directory]}] false # # NOTE: Set the name of the running test suite, if necessary. # if {![info exists test_suite]} then { set test_suite "System.Data.SQLite Test Suite for Eagle" } |
︙ | ︙ |
Changes to lib/System.Data.SQLite/common.eagle.
︙ | ︙ | |||
474 475 476 477 478 479 480 481 482 483 484 485 486 487 | # # NOTE: If the test suite cannot use [exec] or execution of CorFlags # failed, return false. # return false } proc isBuildAvailable { native directory {varName ""} } { # # NOTE: Build the fully qualified file name for the primary assembly # containing the System.Data.SQLite managed components. It # should be noted that this assembly file may also contain the # native components, if a native build is in use. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 | # # NOTE: If the test suite cannot use [exec] or execution of CorFlags # failed, return false. # return false } proc getCoreBinaryFileNamesOnly {} { # # NOTE: First, check if the list of native library file names has been # manually overridden. # if {[info exists ::native_library_file_names] && \ [llength $::native_library_file_names] > 0} then { # # NOTE: The list of native library file names has been overridden; # therefore, use it verbatim. # return $::native_library_file_names } elseif {[isWindows]} then { # # NOTE: Otherwise, on Windows, always use the default file name # "sqlite3.dll". # return [list sqlite3.dll] } else { # # NOTE: Otherwise, return both the generic POSIX file name and the # Mac OS X file name, since we do not currently have an easy # way to detect which of those platforms we are running on. # return [list libsqlite3.so libsqlite3.dylib] } } proc isBuildAvailable { native directory {varName ""} } { # # NOTE: Build the fully qualified file name for the primary assembly # containing the System.Data.SQLite managed components. It # should be noted that this assembly file may also contain the # native components, if a native build is in use. |
︙ | ︙ | |||
550 551 552 553 554 555 556 | } # # NOTE: Build the fully qualified file name for the SQLite core # library. If this file exists, we should have everything we # need. # | > | | | | | | | | | | | < > | | > | 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 | } # # NOTE: Build the fully qualified file name for the SQLite core # library. If this file exists, we should have everything we # need. # foreach fileNameOnly [getCoreBinaryFileNamesOnly] { set fileName [file nativename [file join $directory \ $architecture $fileNameOnly]] if {[file exists $fileName]} then { return true } set fileName [file nativename [file join $directory \ $platform $fileNameOnly]] if {[file exists $fileName]} then { return true } set fileName [file nativename [file join $directory \ $fileNameOnly]] if {[file exists $fileName]} then { return true } } # # NOTE: One or more native components needed by System.Data.SQLite # are missing. # return false |
︙ | ︙ | |||
787 788 789 790 791 792 793 | # # NOTE: Return the mixed-mode assembly file name. # return [file nativename \ [file join [getBinaryDirectory] $platform System.Data.SQLite.dll]] } elseif {$standard} then { # | | > > > > > > > > > > > > > > | 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 | # # NOTE: Return the mixed-mode assembly file name. # return [file nativename \ [file join [getBinaryDirectory] $platform System.Data.SQLite.dll]] } elseif {$standard} then { # # NOTE: Attempt to determine the native-only standard SQLite library # file name for this platform and then return it. # foreach fileNameOnly [getCoreBinaryFileNamesOnly] { set fileName [file nativename \ [file join [getBinaryDirectory] $platform $fileNameOnly]] if {[file exists $fileName]} then { return $fileName } } # # NOTE: Fallback to returning the native-only standard SQLite library # file name for Windows. # return [file nativename \ [file join [getBinaryDirectory] $platform sqlite3.dll]] } else { # # NOTE: Return the native-only interop assembly file name. # |
︙ | ︙ | |||
3325 3326 3327 3328 3329 3330 3331 | netFx461 netFx45] [getBuildNetFx]]] EntityFramework.dll]] # # NOTE: Build the list of native assembly files that we handle. The # reason the "System.Data.SQLite.dll" file is included here is # because it could be the mixed-mode assembly. # | | | | 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 | netFx461 netFx45] [getBuildNetFx]]] EntityFramework.dll]] # # NOTE: Build the list of native assembly files that we handle. The # reason the "System.Data.SQLite.dll" file is included here is # because it could be the mixed-mode assembly. # set nativeFileNames [getCoreBinaryFileNamesOnly] lappend nativeFileNames SQLite.Interop.dll System.Data.SQLite.dll # # NOTE: Build the list of managed assembly files that we handle. # set managedFileNames [list \ System.Data.SQLite.dll System.Data.SQLite.Linq.dll \ System.Data.SQLite.EF6.dll] |
︙ | ︙ | |||
3563 3564 3565 3566 3567 3568 3569 | [string length $architecture] > 0} then { tryLoadAssembly System.Data.SQLite.dll $architecture } } } } | > | | | | > | 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 | [string length $architecture] > 0} then { tryLoadAssembly System.Data.SQLite.dll $architecture } } } } foreach fileNameOnly [getCoreBinaryFileNamesOnly] { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $fileNameOnly "\"... " \ [file version [getBinaryFileName $fileNameOnly]] \n] } } catch { tputs $::test_channel [appendArgs \ "---- file version of \"SQLite.Interop.dll\"... " \ [file version [getBinaryFileName SQLite.Interop.dll]] \n] } |
︙ | ︙ | |||
3594 3595 3596 3597 3598 3599 3600 | catch { tputs $::test_channel [appendArgs \ "---- file version of \"System.Data.SQLite.EF6.dll\"... " \ [file version [getBinaryFileName System.Data.SQLite.EF6.dll]] \n] } if {[string length $platform] > 0} then { | > | | | | | > > | | | | | > | 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 | catch { tputs $::test_channel [appendArgs \ "---- file version of \"System.Data.SQLite.EF6.dll\"... " \ [file version [getBinaryFileName System.Data.SQLite.EF6.dll]] \n] } if {[string length $platform] > 0} then { foreach fileNameOnly [getCoreBinaryFileNamesOnly] { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $platform \ / $fileNameOnly "\"... " [file version \ [getBinaryFileName $fileNameOnly $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] } } if {[string length $architecture] > 0} then { foreach fileNameOnly [getCoreBinaryFileNamesOnly] { catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $architecture \ / $fileNameOnly "\"... " [file version \ [getBinaryFileName $fileNameOnly $architecture]] \n] } } catch { tputs $::test_channel [appendArgs \ "---- file version of \"" $architecture \ "/SQLite.Interop.dll\"... " [file version \ [getBinaryFileName SQLite.Interop.dll $architecture]] \n] |
︙ | ︙ | |||
3858 3859 3860 3861 3862 3863 3864 | object foreach -alias module $modules { # # NOTE: The module file name here must be normalized. # set fileName [file normalize [$module FileName]] | > | | 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 | object foreach -alias module $modules { # # NOTE: The module file name here must be normalized. # set fileName [file normalize [$module FileName]] if {[lsearch -exact -nocase -- [getCoreBinaryFileNamesOnly] \ [file tail $fileName]] != -1} then { tputs $::test_channel [appendArgs \ "---- found loaded SQLite native library module: " \ $fileName \n] } elseif {[string match \ -nocase */SQLite.Interop.dll $fileName]} then { tputs $::test_channel [appendArgs \ "---- found loaded SQLite interop assembly module: " \ |
︙ | ︙ |