System.Data.SQLite
Check-in [22f40f170c]
Not logged in

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 | SQL archive
Timelines: family | ancestors | descendants | both | tkt-d8491abd0b
Files: files | file ages | folders
SHA1: 22f40f170c15d8d861c1d82b10058e9143ad3cee
User & Date: mistachkin 2012-01-27 18:16:36
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
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Externals/Eagle/lib/Eagle1.0/test.eagle.

    47     47       #
    48     48       set fileName [getTestLog]
    49     49   
    50     50       if {[string length $fileName] > 0} then {
    51     51         appendSharedLogFile $fileName $string
    52     52       }
    53     53     }
           54  +
           55  +  proc getSoftwareRegistryKey { wow64 } {
           56  +    if {$wow64 && [info exists ::tcl_platform(machine)] && \
           57  +        $::tcl_platform(machine) eq "amd64"} then {
           58  +      #
           59  +      # NOTE: Return the WoW64 registry key name because we are running on a
           60  +      #       64-bit operating system and the caller specifically requested
           61  +      #       the Win32 registry key name.
           62  +      #
           63  +      return Software\\Wow6432Node
           64  +    } else {
           65  +      #
           66  +      # NOTE: Return the native registry key name because we are either not
           67  +      #       running on a 64-bit operating system or the caller wants the
           68  +      #       native registry key name (i.e. not the WoW64 registry key name).
           69  +      #
           70  +      return Software
           71  +    }
           72  +  }
    54     73   
    55     74     proc haveConstraint { name } {
    56     75       if {[isEagle]} then {
    57     76         return [expr {
    58     77             [info exists ::eagle_tests(constraints)] && \
    59     78             [lsearch -exact $::eagle_tests(constraints) $name] != -1}]
    60     79       } else {

Changes to Externals/Eagle/lib/Test1.0/constraints.eagle.

  1568   1568           }
  1569   1569   
  1570   1570           #
  1571   1571           # NOTE: Have we not found the directory yet?
  1572   1572           #
  1573   1573           if {[string length $directory] == 0} then {
  1574   1574             #
  1575         -          # NOTE: Registry hive where WiX install information
  1576         -          #       is stored.
         1575  +          # NOTE: Registry hive where WiX install information is stored.  Make
         1576  +          #       sure to look in the WoW64 registry because WiX is currently
         1577  +          #       always installed as a 32-bit application.
  1577   1578             #
  1578         -          set key {HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Installer XML}
         1579  +          set key [appendArgs HKEY_LOCAL_MACHINE\\ \
         1580  +              [getSoftwareRegistryKey true] {\Microsoft\Windows Installer XML}]
  1579   1581   
  1580   1582             #
  1581   1583             # NOTE: The versions of WiX that we support.
  1582   1584             #
  1583   1585             set versions [list 3.5 3.0]
  1584   1586   
  1585   1587             #
................................................................................
  1676   1678         # NOTE: Platform must be Windows for this constraint to even be
  1677   1679         #       checked (i.e. we require the registry).
  1678   1680         #
  1679   1681         set visualStudioVersions [list]
  1680   1682   
  1681   1683         if {$::tcl_platform(platform) eq "windows"} then {
  1682   1684           #
  1683         -        # NOTE: Registry hive where Visual Studio install information
  1684         -        #       is stored.
         1685  +        # NOTE: Registry hive where Visual Studio install information is
         1686  +        #       stored.  Make sure to look in the WoW64 registry because
         1687  +        #       Visual Studio is currently always a 32-bit application.
  1685   1688           #
  1686         -        set key {HKEY_LOCAL_MACHINE\Software\Microsoft\VisualStudio}
         1689  +        set key [appendArgs HKEY_LOCAL_MACHINE\\ \
         1690  +            [getSoftwareRegistryKey true] {\Microsoft\VisualStudio}]
  1687   1691   
  1688   1692           #
  1689   1693           # NOTE: The versions of Visual Studio that we support.
  1690   1694           #
  1691   1695           set versions [list [list 8.0 2005] [list 9.0 2008] [list 10.0 2010]]
  1692   1696   
  1693   1697           #