[Boost-commit] svn:boost r78626 - trunk/tools/build/v2/test/core-language

Subject: [Boost-commit] svn:boost r78626 - trunk/tools/build/v2/test/core-language
From: jurko.gospodnetic_at_[hidden]
Date: 2012-05-25 14:59:06

Author: jurko
Date: 2012-05-25 14:59:05 EDT (Fri, 25 May 2012)
New Revision: 78626
URL: http://svn.boost.org/trac/boost/changeset/78626

Log:
Made the Boost Build core-language test pass on Windows 7. This test expects certain registry keys to exist under HKLM\SYSTEM\CurrentControlSet but Windows 7 added an additional 'Policies' one there.
Text files modified: 
   trunk/tools/build/v2/test/core-language/test.jam |    23 +++++++++++++++++++++--                 
   1 files changed, 21 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/test/core-language/test.jam
==============================================================================
--- trunk/tools/build/v2/test/core-language/test.jam	(original)
+++ trunk/tools/build/v2/test/core-language/test.jam	2012-05-25 14:59:05 EDT (Fri, 25 May 2012)
@@ -1298,11 +1298,30 @@
     local r2 = [ W32_GETREGNAMES "HKCU\\Control Panel\\Sound" : values ] ;
     check-equal w32_getregnames : $(sound:L) : $(r2:L) ;
 
+    #   On Windows 7 & later there may be an additional 'Policies' key under
+    # 'CurrentControlSet'.
+    local rule remove-policies ( param * )
+    {
+        local found ;
+        local r ;
+        for local x in $(param:L)
+        {
+            if ! $(found) && $(x) = "policies"
+            {
+                found = true ;
+            }
+            else
+            {
+                r += $(x) ;
+            }
+        }
+        return $(r) ;
+    }
     local CurrentControlSet = "Control" "Enum" "Hardware Profiles" "Services" ;
     local r3 = [ W32_GETREGNAMES "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet" : subkeys ] ;
-    check-equal w32_getregnames : $(CurrentControlSet:L) : $(r3:L) ;
+    check-equal w32_getregnames : $(CurrentControlSet:L) : [ remove-policies $(r3:L) ] ;
     local r4 = [ W32_GETREGNAMES "HKLM\\SYSTEM\\CurrentControlSet" : subkeys ] ;
-    check-equal w32_getregnames : $(CurrentControlSet:L) : $(r4:L) ;
+    check-equal w32_getregnames : $(CurrentControlSet:L) : [ remove-policies $(r4:L) ] ;
 }
 
 }