Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Modify Eagle registry related test constraint checking to support WoW64. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | tkt-d8491abd0b |
Files: | files | file ages | folders |
SHA1: |
22f40f170c15d8d861c1d82b10058e91 |
User & Date: | mistachkin 2012-01-27 18:16:36.411 |
Context
2012-01-27
| ||
18:40 | Stop the CLR from inlining methods that we want to see in the log file. check-in: 66cb05418d user: mistachkin tags: tkt-d8491abd0b | |
18:16 | Modify Eagle registry related test constraint checking to support WoW64. check-in: 22f40f170c user: mistachkin tags: tkt-d8491abd0b | |
17:03 | Changes to VS designer component installer tests. check-in: 5267ac587b user: mistachkin tags: tkt-d8491abd0b | |
Changes
Changes to Externals/Eagle/lib/Eagle1.0/test.eagle.
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 | # set fileName [getTestLog] if {[string length $fileName] > 0} then { appendSharedLogFile $fileName $string } } proc haveConstraint { name } { if {[isEagle]} then { return [expr { [info exists ::eagle_tests(constraints)] && \ [lsearch -exact $::eagle_tests(constraints) $name] != -1}] } else { | > > > > > > > > > > > > > > > > > > > | 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 | # set fileName [getTestLog] if {[string length $fileName] > 0} then { appendSharedLogFile $fileName $string } } proc getSoftwareRegistryKey { wow64 } { if {$wow64 && [info exists ::tcl_platform(machine)] && \ $::tcl_platform(machine) eq "amd64"} then { # # NOTE: Return the WoW64 registry key name because we are running on a # 64-bit operating system and the caller specifically requested # the Win32 registry key name. # return Software\\Wow6432Node } else { # # NOTE: Return the native registry key name because we are either not # running on a 64-bit operating system or the caller wants the # native registry key name (i.e. not the WoW64 registry key name). # return Software } } proc haveConstraint { name } { if {[isEagle]} then { return [expr { [info exists ::eagle_tests(constraints)] && \ [lsearch -exact $::eagle_tests(constraints) $name] != -1}] } else { |
︙ | ︙ |
Changes to Externals/Eagle/lib/Test1.0/constraints.eagle.
︙ | ︙ | |||
1568 1569 1570 1571 1572 1573 1574 | } # # NOTE: Have we not found the directory yet? # if {[string length $directory] == 0} then { # | | > | > | | 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 | } # # NOTE: Have we not found the directory yet? # if {[string length $directory] == 0} then { # # NOTE: Registry hive where WiX install information is stored. Make # sure to look in the WoW64 registry because WiX is currently # always installed as a 32-bit application. # set key [appendArgs HKEY_LOCAL_MACHINE\\ \ [getSoftwareRegistryKey true] {\Microsoft\Windows Installer XML}] # # NOTE: The versions of WiX that we support. # set versions [list 3.5 3.0] # |
︙ | ︙ | |||
1676 1677 1678 1679 1680 1681 1682 | # NOTE: Platform must be Windows for this constraint to even be # checked (i.e. we require the registry). # set visualStudioVersions [list] if {$::tcl_platform(platform) eq "windows"} then { # | | | > > | | 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 | # NOTE: Platform must be Windows for this constraint to even be # checked (i.e. we require the registry). # set visualStudioVersions [list] if {$::tcl_platform(platform) eq "windows"} then { # # NOTE: Registry hive where Visual Studio install information is # stored. Make sure to look in the WoW64 registry because # Visual Studio is currently always a 32-bit application. # set key [appendArgs HKEY_LOCAL_MACHINE\\ \ [getSoftwareRegistryKey true] {\Microsoft\VisualStudio}] # # NOTE: The versions of Visual Studio that we support. # set versions [list [list 8.0 2005] [list 9.0 2008] [list 10.0 2010]] # |
︙ | ︙ |