Ver Fonte

remove dots from toolset names (see http://thread.gmane.org/gmane.comp.lib.boost.build/6603)

[SVN r25651]
Aleksey Gurtovoy há 21 anos atrás
pai
commit
06ccf80890
4 ficheiros alterados com 2542 adições e 2542 exclusões
  1. 2400 2400
      libs/expected_results.xml
  2. 7 7
      more/getting_started.html
  3. 134 134
      status/explicit-failures-markup.xml
  4. 1 1
      tools/build

+ 2400 - 2400
libs/expected_results.xml

@@ -1,3591 +1,3591 @@
 <expected-failures>
-    <test-result library="bind" test-name="bind_test" toolset="cw-8.3" result="success"/>
-    <test-result library="bind" test-name="bind_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="bind" test-name="bind_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="bind" test-name="bind_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="bind" test-name="bind_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="bind" test-name="bind_test" toolset="cw-8_3" result="success"/>
+    <test-result library="bind" test-name="bind_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="bind" test-name="bind_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="bind" test-name="bind_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="bind" test-name="bind_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="bind" test-name="bind_test" toolset="msvc" result="success"/>
     <test-result library="bind" test-name="bind_test" toolset="msvc-stlport" result="success"/>
     <test-result library="bind" test-name="bind_test" toolset="vc7" result="success"/>
-    <test-result library="bind" test-name="bind_test" toolset="vc7.1" result="success"/>
-    <test-result library="bind" test-name="mem_fn_derived_test" toolset="cw-8.3" result="success"/>
-    <test-result library="bind" test-name="mem_fn_derived_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="bind" test-name="mem_fn_derived_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="bind" test-name="mem_fn_derived_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="bind" test-name="mem_fn_derived_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="bind" test-name="bind_test" toolset="vc-7_1" result="success"/>
+    <test-result library="bind" test-name="mem_fn_derived_test" toolset="cw-8_3" result="success"/>
+    <test-result library="bind" test-name="mem_fn_derived_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="bind" test-name="mem_fn_derived_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="bind" test-name="mem_fn_derived_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="bind" test-name="mem_fn_derived_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="bind" test-name="mem_fn_derived_test" toolset="msvc" result="success"/>
     <test-result library="bind" test-name="mem_fn_derived_test" toolset="msvc-stlport" result="success"/>
     <test-result library="bind" test-name="mem_fn_derived_test" toolset="vc7" result="success"/>
-    <test-result library="bind" test-name="mem_fn_derived_test" toolset="vc7.1" result="success"/>
-    <test-result library="bind" test-name="mem_fn_test" toolset="cw-8.3" result="success"/>
-    <test-result library="bind" test-name="mem_fn_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="bind" test-name="mem_fn_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="bind" test-name="mem_fn_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="bind" test-name="mem_fn_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="bind" test-name="mem_fn_derived_test" toolset="vc-7_1" result="success"/>
+    <test-result library="bind" test-name="mem_fn_test" toolset="cw-8_3" result="success"/>
+    <test-result library="bind" test-name="mem_fn_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="bind" test-name="mem_fn_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="bind" test-name="mem_fn_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="bind" test-name="mem_fn_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="bind" test-name="mem_fn_test" toolset="msvc" result="success"/>
     <test-result library="bind" test-name="mem_fn_test" toolset="msvc-stlport" result="success"/>
     <test-result library="bind" test-name="mem_fn_test" toolset="vc7" result="success"/>
-    <test-result library="bind" test-name="mem_fn_test" toolset="vc7.1" result="success"/>
-    <test-result library="bind" test-name="mem_fn_void_test" toolset="cw-8.3" result="success"/>
-    <test-result library="bind" test-name="mem_fn_void_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="bind" test-name="mem_fn_void_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="bind" test-name="mem_fn_void_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="bind" test-name="mem_fn_void_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="bind" test-name="mem_fn_test" toolset="vc-7_1" result="success"/>
+    <test-result library="bind" test-name="mem_fn_void_test" toolset="cw-8_3" result="success"/>
+    <test-result library="bind" test-name="mem_fn_void_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="bind" test-name="mem_fn_void_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="bind" test-name="mem_fn_void_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="bind" test-name="mem_fn_void_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="bind" test-name="mem_fn_void_test" toolset="msvc" result="success"/>
     <test-result library="bind" test-name="mem_fn_void_test" toolset="msvc-stlport" result="success"/>
     <test-result library="bind" test-name="mem_fn_void_test" toolset="vc7" result="success"/>
-    <test-result library="bind" test-name="mem_fn_void_test" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testclock" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testclock" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testclock" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testclock" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testclock" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="bind" test-name="mem_fn_void_test" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testclock" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testclock" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testclock" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testclock" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testclock" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testclock" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testclock" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testclock" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testclock" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testconstrained_value" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testconstrained_value" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testconstrained_value" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testconstrained_value" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testconstrained_value" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testclock" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testconstrained_value" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testconstrained_value" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testconstrained_value" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testconstrained_value" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testconstrained_value" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testconstrained_value" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testconstrained_value" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testconstrained_value" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testconstrained_value" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testc_local_adjustor" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testc_local_adjustor" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testc_local_adjustor" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testc_local_adjustor" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testc_local_adjustor" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testconstrained_value" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testc_local_adjustor" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testc_local_adjustor" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testc_local_adjustor" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testc_local_adjustor" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testc_local_adjustor" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testc_local_adjustor" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testc_local_adjustor" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testc_local_adjustor" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testc_local_adjustor" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testdate" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testdate" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testdate" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testdate" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testdate" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testc_local_adjustor" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testdate" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testdate" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testdate" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testdate" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testdate" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testdate" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testdate" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testdate" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testdate" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testdate_duration" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testdate_duration" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testdate_duration" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testdate_duration" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testdate_duration" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testdate" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testdate_duration" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testdate_duration" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testdate_duration" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testdate_duration" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testdate_duration" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testdate_duration" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testdate_duration" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testdate_duration" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testdate_duration" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testdate_iterator" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testdate_iterator" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testdate_iterator" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testdate_iterator" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testdate_iterator" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testdate_duration" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testdate_iterator" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testdate_iterator" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testdate_iterator" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testdate_iterator" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testdate_iterator" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testdate_iterator" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testdate_iterator" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testdate_iterator" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testdate_iterator" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testdst_rules" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testdst_rules" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testdst_rules" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testdst_rules" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testdst_rules" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testdate_iterator" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testdst_rules" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testdst_rules" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testdst_rules" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testdst_rules" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testdst_rules" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testdst_rules" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testdst_rules" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testdst_rules" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testdst_rules" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testduration" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testduration" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testduration" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testduration" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testduration" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testdst_rules" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testduration" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testduration" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testduration" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testduration" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testduration" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testduration" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testduration" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testduration" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testduration" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testfacet" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testfacet" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testfacet" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testfacet" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testfacet" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testduration" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testfacet" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testfacet" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testfacet" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testfacet" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testfacet" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testfacet" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testfacet" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testfacet" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testfacet" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testformatters" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testformatters" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testformatters" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testformatters" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testformatters" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testfacet" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testformatters" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testformatters" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testformatters" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testformatters" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testformatters" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testformatters" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testformatters" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testformatters" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testformatters" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testgenerators" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testgenerators" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testgenerators" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testgenerators" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testgenerators" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testformatters" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testgenerators" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testgenerators" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testgenerators" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testgenerators" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testgenerators" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testgenerators" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testgenerators" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testgenerators" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testgenerators" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testgregorian_calendar" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testgregorian_calendar" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testgregorian_calendar" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testgregorian_calendar" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testgregorian_calendar" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testgenerators" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testgregorian_calendar" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testgregorian_calendar" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testgregorian_calendar" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testgregorian_calendar" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testgregorian_calendar" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testgregorian_calendar" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testgregorian_calendar" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testgregorian_calendar" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testgregorian_calendar" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testgreg_cal" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testgreg_cal" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testgreg_cal" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testgreg_cal" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testgreg_cal" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testgregorian_calendar" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testgreg_cal" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testgreg_cal" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testgreg_cal" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testgreg_cal" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testgreg_cal" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testgreg_cal" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testgreg_cal" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testgreg_cal" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testgreg_cal" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testgreg_day" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testgreg_day" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testgreg_day" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testgreg_day" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testgreg_day" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testgreg_cal" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testgreg_day" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testgreg_day" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testgreg_day" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testgreg_day" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testgreg_day" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testgreg_day" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testgreg_day" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testgreg_day" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testgreg_day" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testgreg_month" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testgreg_month" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testgreg_month" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testgreg_month" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testgreg_month" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testgreg_day" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testgreg_month" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testgreg_month" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testgreg_month" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testgreg_month" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testgreg_month" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testgreg_month" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testgreg_month" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testgreg_month" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testgreg_month" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testint_adapter" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testint_adapter" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testint_adapter" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testint_adapter" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testint_adapter" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testgreg_month" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testint_adapter" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testint_adapter" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testint_adapter" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testint_adapter" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testint_adapter" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testint_adapter" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testint_adapter" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testint_adapter" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testint_adapter" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testiterator" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testiterator" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testiterator" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testiterator" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testiterator" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testint_adapter" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testiterator" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testiterator" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testiterator" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testiterator" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testiterator" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testiterator" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testiterator" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testiterator" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testiterator" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testlocal_adjustor" toolset="cw-8.3" result="fail"/>
-    <test-result library="date_time" test-name="testlocal_adjustor" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testlocal_adjustor" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testlocal_adjustor" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testlocal_adjustor" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testiterator" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testlocal_adjustor" toolset="cw-8_3" result="fail"/>
+    <test-result library="date_time" test-name="testlocal_adjustor" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testlocal_adjustor" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testlocal_adjustor" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testlocal_adjustor" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testlocal_adjustor" toolset="msvc" result="fail"/>
     <test-result library="date_time" test-name="testlocal_adjustor" toolset="msvc-stlport" result="fail"/>
     <test-result library="date_time" test-name="testlocal_adjustor" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testlocal_adjustor" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testlocal_adjustor" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testparse_date" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testparse_date" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testparse_date" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testparse_date" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testparse_date" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testmicrosec_time_clock" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testparse_date" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testparse_date" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testparse_date" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testparse_date" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testparse_date" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testparse_date" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testparse_date" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testparse_date" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testparse_date" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testparse_time" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testparse_time" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testparse_time" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testparse_time" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testparse_time" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testparse_date" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testparse_time" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testparse_time" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testparse_time" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testparse_time" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testparse_time" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testparse_time" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testparse_time" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testparse_time" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testparse_time" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testperiod" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testperiod" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testperiod" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testperiod" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testperiod" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testparse_time" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testperiod" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testperiod" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testperiod" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testperiod" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testperiod" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testperiod" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testperiod" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testperiod" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testperiod" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testtime" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testtime" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testtime" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testtime" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testtime" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testperiod" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testtime" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testtime" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testtime" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testtime" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testtime" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testtime" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testtime" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testtime" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testtime" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testtime" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testtime_resolution_traits" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testtime_resolution_traits" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testtime_resolution_traits" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="vc7.1" result="success"/>
-    <test-result library="date_time" test-name="testwrapping_int" toolset="cw-8.3" result="success"/>
-    <test-result library="date_time" test-name="testwrapping_int" toolset="borland-5.5.1" result="success"/>
-    <test-result library="date_time" test-name="testwrapping_int" toolset="borland-5.6.4" result="success"/>
-    <test-result library="date_time" test-name="testwrapping_int" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="date_time" test-name="testwrapping_int" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testtime_resolution_traits" toolset="vc-7_1" result="success"/>
+    <test-result library="date_time" test-name="testwrapping_int" toolset="cw-8_3" result="success"/>
+    <test-result library="date_time" test-name="testwrapping_int" toolset="borland-5_5_1" result="success"/>
+    <test-result library="date_time" test-name="testwrapping_int" toolset="borland-5_6_4" result="success"/>
+    <test-result library="date_time" test-name="testwrapping_int" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="date_time" test-name="testwrapping_int" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="date_time" test-name="testwrapping_int" toolset="msvc" result="success"/>
     <test-result library="date_time" test-name="testwrapping_int" toolset="msvc-stlport" result="success"/>
     <test-result library="date_time" test-name="testwrapping_int" toolset="vc7" result="success"/>
-    <test-result library="date_time" test-name="testwrapping_int" toolset="vc7.1" result="success"/>
-    <test-result library="filesystem" test-name="convenience_test" toolset="cw-8.3" result="success"/>
-    <test-result library="filesystem" test-name="convenience_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="filesystem" test-name="convenience_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="filesystem" test-name="convenience_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="filesystem" test-name="convenience_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="date_time" test-name="testwrapping_int" toolset="vc-7_1" result="success"/>
+    <test-result library="filesystem" test-name="convenience_test" toolset="cw-8_3" result="success"/>
+    <test-result library="filesystem" test-name="convenience_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="filesystem" test-name="convenience_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="filesystem" test-name="convenience_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="filesystem" test-name="convenience_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="filesystem" test-name="convenience_test" toolset="msvc" result="success"/>
     <test-result library="filesystem" test-name="convenience_test" toolset="msvc-stlport" result="success"/>
     <test-result library="filesystem" test-name="convenience_test" toolset="vc7" result="success"/>
-    <test-result library="filesystem" test-name="convenience_test" toolset="vc7.1" result="success"/>
-    <test-result library="filesystem" test-name="fstream_test" toolset="cw-8.3" result="success"/>
-    <test-result library="filesystem" test-name="fstream_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="filesystem" test-name="fstream_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="filesystem" test-name="fstream_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="filesystem" test-name="fstream_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="filesystem" test-name="convenience_test" toolset="vc-7_1" result="success"/>
+    <test-result library="filesystem" test-name="fstream_test" toolset="cw-8_3" result="success"/>
+    <test-result library="filesystem" test-name="fstream_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="filesystem" test-name="fstream_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="filesystem" test-name="fstream_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="filesystem" test-name="fstream_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="filesystem" test-name="fstream_test" toolset="msvc" result="success"/>
     <test-result library="filesystem" test-name="fstream_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="filesystem" test-name="fstream_test" toolset="vc7" result="success"/>
-    <test-result library="filesystem" test-name="fstream_test" toolset="vc7.1" result="fail"/>
-    <test-result library="filesystem" test-name="operations_test" toolset="cw-8.3" result="success"/>
-    <test-result library="filesystem" test-name="operations_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="filesystem" test-name="operations_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="filesystem" test-name="operations_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="filesystem" test-name="operations_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="filesystem" test-name="fstream_test" toolset="vc-7_1" result="fail"/>
+    <test-result library="filesystem" test-name="operations_test" toolset="cw-8_3" result="success"/>
+    <test-result library="filesystem" test-name="operations_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="filesystem" test-name="operations_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="filesystem" test-name="operations_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="filesystem" test-name="operations_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="filesystem" test-name="operations_test" toolset="msvc" result="success"/>
     <test-result library="filesystem" test-name="operations_test" toolset="msvc-stlport" result="success"/>
     <test-result library="filesystem" test-name="operations_test" toolset="vc7" result="success"/>
-    <test-result library="filesystem" test-name="operations_test" toolset="vc7.1" result="success"/>
-    <test-result library="filesystem" test-name="path_test" toolset="cw-8.3" result="success"/>
-    <test-result library="filesystem" test-name="path_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="filesystem" test-name="path_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="filesystem" test-name="path_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="filesystem" test-name="path_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="filesystem" test-name="operations_test" toolset="vc-7_1" result="success"/>
+    <test-result library="filesystem" test-name="path_test" toolset="cw-8_3" result="success"/>
+    <test-result library="filesystem" test-name="path_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="filesystem" test-name="path_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="filesystem" test-name="path_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="filesystem" test-name="path_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="filesystem" test-name="path_test" toolset="msvc" result="success"/>
     <test-result library="filesystem" test-name="path_test" toolset="msvc-stlport" result="success"/>
     <test-result library="filesystem" test-name="path_test" toolset="vc7" result="success"/>
-    <test-result library="filesystem" test-name="path_test" toolset="vc7.1" result="success"/>
-    <test-result library="format" test-name="format_test1" toolset="cw-8.3" result="success"/>
-    <test-result library="format" test-name="format_test1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="format" test-name="format_test1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="format" test-name="format_test1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="format" test-name="format_test1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="filesystem" test-name="path_test" toolset="vc-7_1" result="success"/>
+    <test-result library="format" test-name="format_test1" toolset="cw-8_3" result="success"/>
+    <test-result library="format" test-name="format_test1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="format" test-name="format_test1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="format" test-name="format_test1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="format" test-name="format_test1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="format" test-name="format_test1" toolset="msvc" result="success"/>
     <test-result library="format" test-name="format_test1" toolset="msvc-stlport" result="fail"/>
     <test-result library="format" test-name="format_test1" toolset="vc7" result="success"/>
-    <test-result library="format" test-name="format_test1" toolset="vc7.1" result="success"/>
-    <test-result library="format" test-name="format_test2" toolset="cw-8.3" result="success"/>
-    <test-result library="format" test-name="format_test2" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="format" test-name="format_test2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="format" test-name="format_test2" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="format" test-name="format_test2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="format" test-name="format_test1" toolset="vc-7_1" result="success"/>
+    <test-result library="format" test-name="format_test2" toolset="cw-8_3" result="success"/>
+    <test-result library="format" test-name="format_test2" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="format" test-name="format_test2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="format" test-name="format_test2" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="format" test-name="format_test2" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="format" test-name="format_test2" toolset="msvc" result="success"/>
     <test-result library="format" test-name="format_test2" toolset="msvc-stlport" result="fail"/>
     <test-result library="format" test-name="format_test2" toolset="vc7" result="success"/>
-    <test-result library="format" test-name="format_test2" toolset="vc7.1" result="success"/>
-    <test-result library="format" test-name="format_test_wstring" toolset="cw-8.3" result="success"/>
-    <test-result library="format" test-name="format_test_wstring" toolset="borland-5.5.1" result="success"/>
-    <test-result library="format" test-name="format_test_wstring" toolset="borland-5.6.4" result="success"/>
-    <test-result library="format" test-name="format_test_wstring" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="format" test-name="format_test_wstring" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="format" test-name="format_test2" toolset="vc-7_1" result="success"/>
+    <test-result library="format" test-name="format_test_wstring" toolset="cw-8_3" result="success"/>
+    <test-result library="format" test-name="format_test_wstring" toolset="borland-5_5_1" result="success"/>
+    <test-result library="format" test-name="format_test_wstring" toolset="borland-5_6_4" result="success"/>
+    <test-result library="format" test-name="format_test_wstring" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="format" test-name="format_test_wstring" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="format" test-name="format_test_wstring" toolset="msvc" result="success"/>
     <test-result library="format" test-name="format_test_wstring" toolset="msvc-stlport" result="success"/>
     <test-result library="format" test-name="format_test_wstring" toolset="vc7" result="success"/>
-    <test-result library="format" test-name="format_test_wstring" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="allocator_test" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="allocator_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="allocator_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="allocator_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="function" test-name="allocator_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="format" test-name="format_test_wstring" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="allocator_test" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="allocator_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="allocator_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="allocator_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="function" test-name="allocator_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="allocator_test" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="allocator_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="allocator_test" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="allocator_test" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_30" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_30" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="function_30" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="function_30" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_30" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="allocator_test" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_30" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_30" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="function_30" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="function_30" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_30" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_30" toolset="msvc" result="success"/>
     <test-result library="function" test-name="function_30" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="function_30" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="function_30" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_arith_cxx98" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_arith_cxx98" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="function_arith_cxx98" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="function_arith_cxx98" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_arith_cxx98" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_30" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_arith_cxx98" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_arith_cxx98" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="function_arith_cxx98" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="function_arith_cxx98" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_arith_cxx98" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_arith_cxx98" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="function_arith_cxx98" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="function_arith_cxx98" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="function_arith_cxx98" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_arith_portable" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_arith_portable" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="function_arith_portable" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="function_arith_portable" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_arith_portable" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_arith_cxx98" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_arith_portable" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_arith_portable" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="function_arith_portable" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="function_arith_portable" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_arith_portable" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_arith_portable" toolset="msvc" result="success"/>
     <test-result library="function" test-name="function_arith_portable" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="function_arith_portable" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="function_arith_portable" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_n_test" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_n_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="function_n_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="function_n_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_n_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_arith_portable" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_n_test" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_n_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="function_n_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="function_n_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_n_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_n_test" toolset="msvc" result="success"/>
     <test-result library="function" test-name="function_n_test" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="function_n_test" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="function_n_test" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_ref_cxx98" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_ref_cxx98" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="function_ref_cxx98" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="function_ref_cxx98" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_ref_cxx98" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_n_test" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_ref_cxx98" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_ref_cxx98" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="function_ref_cxx98" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="function_ref_cxx98" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_ref_cxx98" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_ref_cxx98" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="function_ref_cxx98" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="function_ref_cxx98" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="function_ref_cxx98" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_ref_portable" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_ref_portable" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="function_ref_portable" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="function_ref_portable" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_ref_portable" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_ref_cxx98" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_ref_portable" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_ref_portable" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="function_ref_portable" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="function_ref_portable" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_ref_portable" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_ref_portable" toolset="msvc" result="success"/>
     <test-result library="function" test-name="function_ref_portable" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="function_ref_portable" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="function_ref_portable" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_test_fail1" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_test_fail1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="function_test_fail1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="function_test_fail1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_test_fail1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_ref_portable" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_test_fail1" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_test_fail1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="function_test_fail1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="function_test_fail1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_test_fail1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_test_fail1" toolset="msvc" result="success"/>
     <test-result library="function" test-name="function_test_fail1" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="function_test_fail1" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="function_test_fail1" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="function_test_fail2" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="function_test_fail2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="function_test_fail2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="function_test_fail2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="function_test_fail2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="function_test_fail1" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="function_test_fail2" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="function_test_fail2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="function_test_fail2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="function_test_fail2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="function_test_fail2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="function_test_fail2" toolset="msvc" result="success"/>
     <test-result library="function" test-name="function_test_fail2" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="function_test_fail2" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="function_test_fail2" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="lambda_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="function" test-name="lambda_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="lambda_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="lambda_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="function" test-name="lambda_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="function" test-name="function_test_fail2" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="lambda_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="function" test-name="lambda_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="lambda_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="lambda_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="function" test-name="lambda_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="function" test-name="lambda_test" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="lambda_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="lambda_test" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="lambda_test" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="lib_function_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="function" test-name="lib_function_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="lib_function_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="lib_function_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="lib_function_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="lambda_test" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="lib_function_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="function" test-name="lib_function_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="lib_function_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="lib_function_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="lib_function_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="lib_function_test" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="lib_function_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="lib_function_test" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="lib_function_test" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="mem_fun_cxx98" toolset="cw-8.3" result="fail"/>
-    <test-result library="function" test-name="mem_fun_cxx98" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="mem_fun_cxx98" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="mem_fun_cxx98" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="mem_fun_cxx98" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="lib_function_test" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="mem_fun_cxx98" toolset="cw-8_3" result="fail"/>
+    <test-result library="function" test-name="mem_fun_cxx98" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="mem_fun_cxx98" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="mem_fun_cxx98" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="mem_fun_cxx98" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="mem_fun_cxx98" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="mem_fun_cxx98" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="mem_fun_cxx98" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="mem_fun_cxx98" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="mem_fun_portable" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="mem_fun_portable" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="mem_fun_portable" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="mem_fun_portable" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="mem_fun_portable" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="mem_fun_cxx98" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="mem_fun_portable" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="mem_fun_portable" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="mem_fun_portable" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="mem_fun_portable" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="mem_fun_portable" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="mem_fun_portable" toolset="msvc" result="success"/>
     <test-result library="function" test-name="mem_fun_portable" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="mem_fun_portable" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="mem_fun_portable" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="stateless_test" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="stateless_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="stateless_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="stateless_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="stateless_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="mem_fun_portable" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="stateless_test" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="stateless_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="stateless_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="stateless_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="stateless_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="stateless_test" toolset="msvc" result="success"/>
     <test-result library="function" test-name="stateless_test" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="stateless_test" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="stateless_test" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="std_bind_cxx98" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="std_bind_cxx98" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="std_bind_cxx98" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="std_bind_cxx98" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="function" test-name="std_bind_cxx98" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="stateless_test" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="std_bind_cxx98" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="std_bind_cxx98" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="std_bind_cxx98" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="std_bind_cxx98" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="function" test-name="std_bind_cxx98" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="std_bind_cxx98" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="std_bind_cxx98" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="std_bind_cxx98" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="std_bind_cxx98" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="std_bind_portable" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="std_bind_portable" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="std_bind_portable" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="std_bind_portable" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="function" test-name="std_bind_portable" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="std_bind_cxx98" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="std_bind_portable" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="std_bind_portable" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="std_bind_portable" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="std_bind_portable" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="function" test-name="std_bind_portable" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="std_bind_portable" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="std_bind_portable" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="std_bind_portable" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="std_bind_portable" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="sum_avg_cxx98" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="sum_avg_cxx98" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="function" test-name="sum_avg_cxx98" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="function" test-name="sum_avg_cxx98" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="sum_avg_cxx98" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="std_bind_portable" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="sum_avg_cxx98" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="sum_avg_cxx98" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="function" test-name="sum_avg_cxx98" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="function" test-name="sum_avg_cxx98" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="sum_avg_cxx98" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="sum_avg_cxx98" toolset="msvc" result="fail"/>
     <test-result library="function" test-name="sum_avg_cxx98" toolset="msvc-stlport" result="fail"/>
     <test-result library="function" test-name="sum_avg_cxx98" toolset="vc7" result="fail"/>
-    <test-result library="function" test-name="sum_avg_cxx98" toolset="vc7.1" result="success"/>
-    <test-result library="function" test-name="sum_avg_portable" toolset="cw-8.3" result="success"/>
-    <test-result library="function" test-name="sum_avg_portable" toolset="borland-5.5.1" result="success"/>
-    <test-result library="function" test-name="sum_avg_portable" toolset="borland-5.6.4" result="success"/>
-    <test-result library="function" test-name="sum_avg_portable" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="function" test-name="sum_avg_portable" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="sum_avg_cxx98" toolset="vc-7_1" result="success"/>
+    <test-result library="function" test-name="sum_avg_portable" toolset="cw-8_3" result="success"/>
+    <test-result library="function" test-name="sum_avg_portable" toolset="borland-5_5_1" result="success"/>
+    <test-result library="function" test-name="sum_avg_portable" toolset="borland-5_6_4" result="success"/>
+    <test-result library="function" test-name="sum_avg_portable" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="function" test-name="sum_avg_portable" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="function" test-name="sum_avg_portable" toolset="msvc" result="success"/>
     <test-result library="function" test-name="sum_avg_portable" toolset="msvc-stlport" result="success"/>
     <test-result library="function" test-name="sum_avg_portable" toolset="vc7" result="success"/>
-    <test-result library="function" test-name="sum_avg_portable" toolset="vc7.1" result="success"/>
-    <test-result library="math" test-name="common_factor_test" toolset="cw-8.3" result="success"/>
-    <test-result library="math" test-name="common_factor_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="math" test-name="common_factor_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="math" test-name="common_factor_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="math" test-name="common_factor_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="function" test-name="sum_avg_portable" toolset="vc-7_1" result="success"/>
+    <test-result library="math" test-name="common_factor_test" toolset="cw-8_3" result="success"/>
+    <test-result library="math" test-name="common_factor_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="math" test-name="common_factor_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="math" test-name="common_factor_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="math" test-name="common_factor_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="math" test-name="common_factor_test" toolset="msvc" result="success"/>
     <test-result library="math" test-name="common_factor_test" toolset="msvc-stlport" result="success"/>
     <test-result library="math" test-name="common_factor_test" toolset="vc7" result="success"/>
-    <test-result library="math" test-name="common_factor_test" toolset="vc7.1" result="success"/>
-    <test-result library="math" test-name="octonion_test" toolset="cw-8.3" result="success"/>
-    <test-result library="math" test-name="octonion_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="math" test-name="octonion_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="math" test-name="octonion_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="math" test-name="octonion_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="math" test-name="common_factor_test" toolset="vc-7_1" result="success"/>
+    <test-result library="math" test-name="octonion_test" toolset="cw-8_3" result="success"/>
+    <test-result library="math" test-name="octonion_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="math" test-name="octonion_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="math" test-name="octonion_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="math" test-name="octonion_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="math" test-name="octonion_test" toolset="msvc" result="fail"/>
     <test-result library="math" test-name="octonion_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="math" test-name="octonion_test" toolset="vc7" result="fail"/>
-    <test-result library="math" test-name="octonion_test" toolset="vc7.1" result="fail"/>
-    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="cw-8.3" result="success"/>
-    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="math" test-name="octonion_test" toolset="vc-7_1" result="fail"/>
+    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="cw-8_3" result="success"/>
+    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="math" test-name="quaternion_mult_incl_test" toolset="msvc" result="success"/>
     <test-result library="math" test-name="quaternion_mult_incl_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="math" test-name="quaternion_mult_incl_test" toolset="vc7" result="success"/>
-    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="vc7.1" result="success"/>
-    <test-result library="math" test-name="quaternion_test" toolset="cw-8.3" result="success"/>
-    <test-result library="math" test-name="quaternion_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="math" test-name="quaternion_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="math" test-name="quaternion_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="math" test-name="quaternion_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="math" test-name="quaternion_mult_incl_test" toolset="vc-7_1" result="success"/>
+    <test-result library="math" test-name="quaternion_test" toolset="cw-8_3" result="success"/>
+    <test-result library="math" test-name="quaternion_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="math" test-name="quaternion_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="math" test-name="quaternion_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="math" test-name="quaternion_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="math" test-name="quaternion_test" toolset="msvc" result="fail"/>
     <test-result library="math" test-name="quaternion_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="math" test-name="quaternion_test" toolset="vc7" result="fail"/>
-    <test-result library="math" test-name="quaternion_test" toolset="vc7.1" result="fail"/>
-    <test-result library="math" test-name="special_functions_test" toolset="cw-8.3" result="success"/>
-    <test-result library="math" test-name="special_functions_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="math" test-name="special_functions_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="math" test-name="special_functions_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="math" test-name="special_functions_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="math" test-name="quaternion_test" toolset="vc-7_1" result="fail"/>
+    <test-result library="math" test-name="special_functions_test" toolset="cw-8_3" result="success"/>
+    <test-result library="math" test-name="special_functions_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="math" test-name="special_functions_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="math" test-name="special_functions_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="math" test-name="special_functions_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="math" test-name="special_functions_test" toolset="msvc" result="fail"/>
     <test-result library="math" test-name="special_functions_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="math" test-name="special_functions_test" toolset="vc7" result="fail"/>
-    <test-result library="math" test-name="special_functions_test" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="advance" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="advance" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="advance" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="advance" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="advance" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="math" test-name="special_functions_test" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="advance" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="advance" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="advance" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="advance" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="advance" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="advance" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="advance" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="advance" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="advance" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="always" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="always" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="always" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="always" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="always" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="advance" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="always" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="always" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="always" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="always" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="always" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="always" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="always" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="always" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="always" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="apply" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="apply" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="apply" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="apply" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="apply" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="always" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="apply" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="apply" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="apply" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="apply" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="apply" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="apply" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="apply" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="apply" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="apply" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="apply_if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="apply_if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="apply_if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="apply_if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="apply_if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="apply" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="apply_if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="apply_if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="apply_if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="apply_if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="apply_if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="apply_if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="apply_if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="apply_if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="apply_if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="apply_if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="arithmetic" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="arithmetic" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="arithmetic" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="assert_is_same" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="assert_is_same" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="assert_is_same" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="assert_is_same" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="assert_is_same" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="assert_is_same" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="assert_is_same" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="assert_is_same" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="assert_is_same" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="assert_is_same" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="assert_is_same" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="assert_is_same" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="assert_is_same" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="assert_is_same" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="as_sequence" toolset="cw-8.3" result="fail"/>
-    <test-result library="mpl" test-name="as_sequence" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="mpl" test-name="as_sequence" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="mpl" test-name="as_sequence" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="as_sequence" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="assert_is_same" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="as_sequence" toolset="cw-8_3" result="fail"/>
+    <test-result library="mpl" test-name="as_sequence" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="mpl" test-name="as_sequence" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="mpl" test-name="as_sequence" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="as_sequence" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="as_sequence" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="as_sequence" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="as_sequence" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="as_sequence" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="at" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="at" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="at" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="at" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="at" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="as_sequence" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="at" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="at" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="at" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="at" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="at" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="at" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="at" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="at" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="at" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="back" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="back" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="back" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="back" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="back" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="at" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="back" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="back" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="back" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="back" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="back" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="back" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="back" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="back" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="back" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="bind" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="bind" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="bind" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="bind" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="bind" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="back" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="bind" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="bind" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="bind" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="bind" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="bind" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="bind" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="bind" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="bind" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="bind" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="bitwise" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="bitwise" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="bitwise" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="bitwise" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="bitwise" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="bind" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="bitwise" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="bitwise" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="bitwise" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="bitwise" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="bitwise" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="bitwise" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="bitwise" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="bitwise" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="bitwise" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="bool" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="bool" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="bool" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="bool" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="bool" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="bitwise" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="bool" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="bool" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="bool" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="bool" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="bool" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="bool" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="bool" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="bool" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="bool" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="bool" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="comparison" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="comparison" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="comparison" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="contains" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="contains" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="contains" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="contains" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="contains" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="contains" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="contains" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="contains" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="contains" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="contains" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="contains" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="contains" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="contains" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="contains" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="copy" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="copy" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="copy" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="copy" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="copy" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="contains" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="copy" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="copy" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="copy" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="copy" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="copy" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="copy" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="copy" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="copy" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="copy" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="copy_backward" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="copy_backward" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="copy_backward" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="copy_backward" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="copy_backward" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="copy" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="copy_backward" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="copy_backward" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="copy_backward" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="copy_backward" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="copy_backward" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="copy_backward" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="copy_backward" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="copy_backward" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="copy_backward" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="copy_backward_if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="copy_backward_if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="copy_backward_if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="copy_backward_if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="copy_backward_if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="copy_backward" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="copy_backward_if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="copy_backward_if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="copy_backward_if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="copy_backward_if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="copy_backward_if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="copy_backward_if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="copy_backward_if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="copy_backward_if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="copy_backward_if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="copy_if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="copy_if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="copy_if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="copy_if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="copy_if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="copy_backward_if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="copy_if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="copy_if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="copy_if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="copy_if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="copy_if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="copy_if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="copy_if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="copy_if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="copy_if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="count" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="count" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="count" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="count" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="count" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="copy_if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="count" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="count" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="count" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="count" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="count" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="count" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="count" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="count" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="count" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="count_if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="count_if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="count_if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="count_if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="count_if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="count" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="count_if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="count_if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="count_if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="count_if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="count_if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="count_if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="count_if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="count_if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="count_if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="distance" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="distance" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="distance" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="distance" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="distance" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="count_if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="distance" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="distance" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="distance" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="distance" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="distance" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="distance" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="distance" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="distance" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="distance" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="empty" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="empty" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="empty" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="empty" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="empty" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="distance" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="empty" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="empty" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="empty" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="empty" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="empty" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="empty" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="empty" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="empty" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="empty" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="equal" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="equal" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="equal" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="equal" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="equal" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="empty" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="equal" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="equal" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="equal" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="equal" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="equal" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="equal" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="equal" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="equal" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="equal" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="erase" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="erase" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="erase" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="erase" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="erase" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="equal" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="erase" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="erase" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="erase" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="erase" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="erase" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="erase" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="erase" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="erase" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="erase" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="erase_range" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="erase_range" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="erase_range" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="erase_range" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="erase_range" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="erase" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="erase_range" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="erase_range" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="erase_range" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="erase_range" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="erase_range" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="erase_range" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="erase_range" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="erase_range" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="erase_range" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="filter_view" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="filter_view" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="filter_view" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="filter_view" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="filter_view" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="erase_range" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="filter_view" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="filter_view" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="filter_view" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="filter_view" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="filter_view" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="filter_view" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="filter_view" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="filter_view" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="filter_view" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="find" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="find" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="find" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="find" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="find" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="filter_view" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="find" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="find" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="find" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="find" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="find" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="find" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="find" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="find" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="find" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="find_if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="find_if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="find_if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="find_if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="find_if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="find" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="find_if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="find_if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="find_if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="find_if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="find_if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="find_if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="find_if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="find_if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="find_if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="fold" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="fold" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="fold" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="fold" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="fold" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="find_if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="fold" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="fold" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="fold" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="fold" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="fold" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="fold" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="fold" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="fold" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="fold" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="for_each" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="for_each" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="for_each" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="for_each" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="for_each" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="fold" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="for_each" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="for_each" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="for_each" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="for_each" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="for_each" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="for_each" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="for_each" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="for_each" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="for_each" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="front" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="front" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="front" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="front" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="front" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="for_each" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="front" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="front" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="front" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="front" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="front" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="front" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="front" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="front" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="front" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="identity" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="identity" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="identity" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="identity" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="identity" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="front" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="identity" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="identity" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="identity" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="identity" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="identity" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="identity" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="identity" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="identity" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="identity" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="identity" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="inherit" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="inherit" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="inherit" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="inherit" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="inherit" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="inherit" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="inherit" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="inherit" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="inherit" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="inherit" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="inherit" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="inherit" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="inherit" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="inherit" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="insert" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="insert" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="insert" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="insert" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="insert" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="inherit" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="insert" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="insert" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="insert" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="insert" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="insert" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="insert" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="insert" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="insert" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="insert" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="insert_range" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="insert_range" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="insert_range" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="insert_range" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="insert_range" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="insert" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="insert_range" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="insert_range" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="insert_range" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="insert_range" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="insert_range" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="insert_range" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="insert_range" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="insert_range" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="insert_range" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="int" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="int" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="int" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="int" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="int" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="insert_range" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="int" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="int" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="int" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="int" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="int" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="int" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="int" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="int" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="int" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="integral_c" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="integral_c" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="integral_c" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="integral_c" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="integral_c" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="int" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="integral_c" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="integral_c" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="integral_c" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="integral_c" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="integral_c" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="integral_c" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="integral_c" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="integral_c" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="integral_c" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="is_placeholder" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="is_placeholder" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="is_placeholder" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="is_placeholder" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="is_placeholder" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="integral_c" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="is_placeholder" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="is_placeholder" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="is_placeholder" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="is_placeholder" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="is_placeholder" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="is_placeholder" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="is_placeholder" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="is_placeholder" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="is_placeholder" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="is_sequence" toolset="cw-8.3" result="fail"/>
-    <test-result library="mpl" test-name="is_sequence" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="mpl" test-name="is_sequence" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="mpl" test-name="is_sequence" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="is_sequence" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="is_placeholder" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="is_sequence" toolset="cw-8_3" result="fail"/>
+    <test-result library="mpl" test-name="is_sequence" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="mpl" test-name="is_sequence" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="mpl" test-name="is_sequence" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="is_sequence" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="is_sequence" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="is_sequence" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="is_sequence" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="is_sequence" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="joint_view" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="joint_view" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="joint_view" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="joint_view" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="joint_view" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="is_sequence" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="joint_view" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="joint_view" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="joint_view" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="joint_view" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="joint_view" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="joint_view" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="joint_view" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="joint_view" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="joint_view" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="lambda" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="lambda" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="mpl" test-name="lambda" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="lambda" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="lambda" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="joint_view" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="lambda" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="lambda" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="mpl" test-name="lambda" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="lambda" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="lambda" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="lambda" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="lambda" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="lambda" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="lambda" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="lambda_args" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="lambda_args" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="lambda_args" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="lambda_args" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="lambda_args" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="lambda" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="lambda_args" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="lambda_args" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="lambda_args" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="lambda_args" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="lambda_args" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="lambda_args" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="lambda_args" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="lambda_args" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="lambda_args" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="lambda_args" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="list" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="list" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="list" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="list_c" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="list_c" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="list_c" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="list_c" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="list_c" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="list_c" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="list_c" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="list_c" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="list_c" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="list_c" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="list_c" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="list_c" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="list_c" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="list_c" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="list_c" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="logical" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="logical" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="logical" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="lower_bound" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="lower_bound" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="lower_bound" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="lower_bound" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="lower_bound" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="lower_bound" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="lower_bound" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="lower_bound" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="lower_bound" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="lower_bound" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="lower_bound" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="lower_bound" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="lower_bound" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="lower_bound" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="next" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="next" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="next" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="next" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="next" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="lower_bound" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="next" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="next" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="next" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="next" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="next" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="next" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="next" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="next" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="next" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="pop_front" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="pop_front" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="pop_front" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="pop_front" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="pop_front" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="next" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="pop_front" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="pop_front" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="pop_front" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="pop_front" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="pop_front" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="pop_front" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="pop_front" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="pop_front" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="pop_front" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="push_front" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="push_front" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="push_front" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="push_front" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="push_front" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="pop_front" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="push_front" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="push_front" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="push_front" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="push_front" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="push_front" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="push_front" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="push_front" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="push_front" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="push_front" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="quote" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="quote" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="mpl" test-name="quote" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="mpl" test-name="quote" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="quote" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="push_front" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="quote" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="quote" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="mpl" test-name="quote" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="mpl" test-name="quote" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="quote" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="quote" toolset="msvc" result="fail"/>
     <test-result library="mpl" test-name="quote" toolset="msvc-stlport" result="fail"/>
     <test-result library="mpl" test-name="quote" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="quote" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="range_c" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="range_c" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="range_c" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="range_c" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="range_c" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="quote" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="range_c" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="range_c" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="range_c" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="range_c" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="range_c" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="range_c" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="range_c" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="range_c" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="range_c" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="replace" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="replace" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="replace" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="replace" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="replace" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="range_c" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="replace" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="replace" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="replace" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="replace" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="replace" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="replace" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="replace" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="replace" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="replace" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="replace_if" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="replace_if" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="replace_if" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="replace_if" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="replace_if" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="replace" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="replace_if" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="replace_if" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="replace_if" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="replace_if" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="replace_if" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="replace_if" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="replace_if" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="replace_if" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="replace_if" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="reverse" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="reverse" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="reverse" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="reverse" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="reverse" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="replace_if" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="reverse" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="reverse" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="reverse" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="reverse" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="reverse" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="reverse" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="reverse" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="reverse" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="reverse" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="same_as" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="same_as" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="same_as" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="same_as" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="same_as" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="reverse" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="same_as" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="same_as" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="same_as" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="same_as" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="same_as" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="same_as" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="same_as" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="same_as" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="same_as" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="single_view" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="single_view" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="single_view" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="single_view" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="single_view" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="same_as" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="single_view" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="single_view" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="single_view" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="single_view" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="single_view" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="single_view" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="single_view" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="single_view" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="single_view" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="size" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="size" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="size" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="size" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="size" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="single_view" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="size" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="size" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="size" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="size" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="size" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="size" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="size" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="size" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="size" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="sizeof" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="sizeof" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="sizeof" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="sizeof" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="sizeof" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="size" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="sizeof" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="sizeof" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="sizeof" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="sizeof" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="sizeof" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="sizeof" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="sizeof" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="sizeof" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="sizeof" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="transform" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="transform" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="transform" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="transform" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="transform" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="sizeof" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="transform" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="transform" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="transform" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="transform" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="transform" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="transform" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="transform" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="transform" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="transform" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="transform_view" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="transform_view" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="transform_view" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="transform_view" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="transform_view" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="transform" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="transform_view" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="transform_view" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="transform_view" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="transform_view" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="transform_view" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="transform_view" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="transform_view" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="transform_view" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="transform_view" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="unique" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="unique" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="unique" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="unique" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="unique" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="transform_view" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="unique" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="unique" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="unique" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="unique" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="unique" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="unique" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="unique" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="unique" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="unique" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="upper_bound" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="upper_bound" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="upper_bound" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="upper_bound" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="upper_bound" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="unique" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="upper_bound" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="upper_bound" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="upper_bound" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="upper_bound" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="upper_bound" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="upper_bound" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="upper_bound" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="upper_bound" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="upper_bound" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="vector" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="vector" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="vector" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="vector" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="vector" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="upper_bound" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="vector" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="vector" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="vector" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="vector" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="vector" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="vector" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="vector" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="vector" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="vector" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="vector_c" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="vector_c" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="vector_c" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="vector_c" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="vector_c" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="vector" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="vector_c" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="vector_c" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="vector_c" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="vector_c" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="vector_c" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="vector_c" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="vector_c" toolset="msvc-stlport" result="success"/>
     <test-result library="mpl" test-name="vector_c" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="vector_c" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="zip_view" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="zip_view" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="mpl" test-name="zip_view" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="mpl" test-name="zip_view" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="zip_view" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="vector_c" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="zip_view" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="zip_view" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="mpl" test-name="zip_view" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="mpl" test-name="zip_view" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="zip_view" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="zip_view" toolset="msvc" result="fail"/>
     <test-result library="mpl" test-name="zip_view" toolset="msvc-stlport" result="fail"/>
     <test-result library="mpl" test-name="zip_view" toolset="vc7" result="fail"/>
-    <test-result library="mpl" test-name="zip_view" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="add" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="add" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="add" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/interval" test-name="add" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="add" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="mpl" test-name="zip_view" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="add" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="add" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="add" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/interval" test-name="add" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="add" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="add" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="add" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="add" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="add" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="cmp" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="add" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp" toolset="vc7" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_exp" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_exp" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="cmp_exp" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="cmp_exp" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="cmp_exp" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp_exp" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp_exp" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp_exp" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp_exp" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp_exp" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp_exp" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp_exp" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp_exp" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="cmp_exp" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_lex" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_lex" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_lex" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_lex" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="cmp_lex" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp_exp" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp_lex" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp_lex" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp_lex" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/interval" test-name="cmp_lex" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp_lex" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp_lex" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp_lex" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="cmp_lex" toolset="vc7" result="success"/>
-    <test-result library="numeric/interval" test-name="cmp_lex" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="det" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="det" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="det" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="det" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="det" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="cmp_lex" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="det" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="det" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="det" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="det" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="det" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="det" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="det" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="det" toolset="vc7" result="success"/>
-    <test-result library="numeric/interval" test-name="det" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="fmod" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="fmod" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="fmod" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/interval" test-name="fmod" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="fmod" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="det" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="fmod" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="fmod" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="fmod" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/interval" test-name="fmod" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="fmod" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="fmod" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="fmod" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="fmod" toolset="vc7" result="success"/>
-    <test-result library="numeric/interval" test-name="fmod" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="mul" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="mul" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="mul" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="mul" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="mul" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="fmod" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="mul" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="mul" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="mul" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="mul" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="mul" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="mul" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="mul" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="mul" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="mul" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="overflow" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="overflow" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="overflow" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="overflow" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="overflow" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="mul" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="overflow" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="overflow" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="overflow" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="overflow" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="overflow" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="overflow" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="overflow" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="overflow" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="overflow" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="pi" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="pi" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/interval" test-name="pi" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="pi" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="pi" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="overflow" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="pi" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="pi" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/interval" test-name="pi" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="pi" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="pi" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="pi" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="pi" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="pi" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="pi" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="pow" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="pow" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="pow" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="pow" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="pow" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="pi" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="pow" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="pow" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="pow" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="pow" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="pow" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="pow" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="pow" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="pow" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="pow" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/interval" test-name="test_float" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/interval" test-name="test_float" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="numeric/interval" test-name="test_float" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="numeric/interval" test-name="test_float" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/interval" test-name="test_float" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/interval" test-name="pow" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/interval" test-name="test_float" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/interval" test-name="test_float" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="numeric/interval" test-name="test_float" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="numeric/interval" test-name="test_float" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/interval" test-name="test_float" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/interval" test-name="test_float" toolset="msvc" result="fail"/>
     <test-result library="numeric/interval" test-name="test_float" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/interval" test-name="test_float" toolset="vc7" result="fail"/>
-    <test-result library="numeric/interval" test-name="test_float" toolset="vc7.1" result="fail"/>
-    <test-result library="optional" test-name="optional_test" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/interval" test-name="test_float" toolset="vc-7_1" result="fail"/>
+    <test-result library="optional" test-name="optional_test" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test" toolset="vc7.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail1" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test" toolset="vc-7_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail1" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test_fail1" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test_fail1" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test_fail1" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail1" toolset="vc7.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail2" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail1" toolset="vc-7_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail2" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test_fail2" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test_fail2" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test_fail2" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail2" toolset="vc7.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail3" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail2" toolset="vc-7_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail3" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test_fail3" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test_fail3" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test_fail3" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail3" toolset="vc7.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail4" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail4" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail4" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail3" toolset="vc-7_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail4" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail4" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail4" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test_fail4" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test_fail4" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test_fail4" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail4" toolset="vc7.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5a" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5a" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5a" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5a" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5a" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail4" toolset="vc-7_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5a" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5a" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5a" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5a" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5a" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test_fail5a" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test_fail5a" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test_fail5a" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5a" toolset="vc7.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5b" toolset="cw-8.3" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5b" toolset="borland-5.5.1" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5b" toolset="borland-5.6.4" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5b" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5b" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5a" toolset="vc-7_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5b" toolset="cw-8_3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5b" toolset="borland-5_5_1" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5b" toolset="borland-5_6_4" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5b" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5b" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="optional" test-name="optional_test_fail5b" toolset="msvc" result="success"/>
     <test-result library="optional" test-name="optional_test_fail5b" toolset="msvc-stlport" result="success"/>
     <test-result library="optional" test-name="optional_test_fail5b" toolset="vc7" result="success"/>
-    <test-result library="optional" test-name="optional_test_fail5b" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="credit_card_example" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="credit_card_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="credit_card_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="credit_card_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="credit_card_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="optional" test-name="optional_test_fail5b" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="credit_card_example" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="credit_card_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="credit_card_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="credit_card_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="credit_card_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="credit_card_example" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="credit_card_example" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="credit_card_example" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="credit_card_example" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="jgrep" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="jgrep" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="jgrep" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="jgrep" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="jgrep" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="credit_card_example" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="jgrep" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="jgrep" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="jgrep" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="jgrep" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="jgrep" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="jgrep" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="jgrep" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="jgrep" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="jgrep" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="partial_regex_grep" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="partial_regex_grep" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="partial_regex_grep" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="partial_regex_grep" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="partial_regex_grep" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="jgrep" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="partial_regex_grep" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="partial_regex_grep" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="partial_regex_grep" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="partial_regex_grep" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="partial_regex_grep" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="partial_regex_grep" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="partial_regex_grep" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="partial_regex_grep" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="partial_regex_grep" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="partial_regex_match" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="partial_regex_match" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="partial_regex_match" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="partial_regex_match" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="partial_regex_match" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="partial_regex_grep" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="partial_regex_match" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="partial_regex_match" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="partial_regex_match" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="partial_regex_match" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="partial_regex_match" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="partial_regex_match" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="partial_regex_match" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="partial_regex_match" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="partial_regex_match" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_1" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="partial_regex_match" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_1" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_1" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_1" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="regex_grep_example_1" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_1" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_2" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_1" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_2" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_2" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_2" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="regex_grep_example_2" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_2" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_3" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_3" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="regex" test-name="regex_grep_example_3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_2" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_3" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_3" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="regex" test-name="regex_grep_example_3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_3" toolset="msvc" result="fail"/>
     <test-result library="regex" test-name="regex_grep_example_3" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="regex_grep_example_3" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_3" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_4" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_4" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_4" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_3" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_4" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_4" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_4" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_4" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_4" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="regex_grep_example_4" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_grep_example_4" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_match_example" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_match_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_match_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_match_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_match_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_grep_example_4" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_match_example" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_match_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_match_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_match_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_match_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_match_example" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_match_example" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="regex_match_example" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_match_example" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_merge_example" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_merge_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_merge_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_merge_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_merge_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_match_example" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_merge_example" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_merge_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_merge_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_merge_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_merge_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_merge_example" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_merge_example" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="regex_merge_example" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_merge_example" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_search_example" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_search_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_search_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_search_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_search_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_merge_example" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_search_example" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_search_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_search_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_search_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_search_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_search_example" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_search_example" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="regex_search_example" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_search_example" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_1" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_search_example" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_1" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_split_example_1" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_split_example_1" toolset="msvc-stlport" result="fail"/>
     <test-result library="regex" test-name="regex_split_example_1" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_1" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_2" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_1" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_2" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_split_example_2" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_split_example_2" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="regex_split_example_2" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_split_example_2" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regex_timer" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regex_timer" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regex_timer" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regex_timer" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regex_timer" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_split_example_2" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regex_timer" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regex_timer" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regex_timer" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regex_timer" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regex_timer" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regex_timer" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regex_timer" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="regex_timer" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regex_timer" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="posix_api_check" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="posix_api_check" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="posix_api_check" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="posix_api_check" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="posix_api_check" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regex_timer" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="posix_api_check" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="posix_api_check" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="posix_api_check" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="posix_api_check" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="posix_api_check" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="posix_api_check" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="posix_api_check" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="posix_api_check" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="posix_api_check" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="posix_api_check_c" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="posix_api_check_c" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="posix_api_check_c" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="posix_api_check_c" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="posix_api_check_c" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="posix_api_check" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="posix_api_check_c" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="posix_api_check_c" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="posix_api_check_c" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="posix_api_check_c" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="posix_api_check_c" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="posix_api_check_c" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="posix_api_check_c" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="posix_api_check_c" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="posix_api_check_c" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="regress" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="regress" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="regress" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="regress" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="regress" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="posix_api_check_c" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="regress" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="regress" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="regress" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="regress" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="regress" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="regress" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="regress" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="regress" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="regress" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="regress" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="wide_posix_api_check" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="wide_posix_api_check" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="wide_posix_api_check" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="wide_posix_api_check_c" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="wide_posix_api_check_c" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="wide_posix_api_check_c" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="vc7.1" result="success"/>
-    <test-result library="regex" test-name="wregress" toolset="cw-8.3" result="success"/>
-    <test-result library="regex" test-name="wregress" toolset="borland-5.5.1" result="success"/>
-    <test-result library="regex" test-name="wregress" toolset="borland-5.6.4" result="success"/>
-    <test-result library="regex" test-name="wregress" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="regex" test-name="wregress" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="wide_posix_api_check_c" toolset="vc-7_1" result="success"/>
+    <test-result library="regex" test-name="wregress" toolset="cw-8_3" result="success"/>
+    <test-result library="regex" test-name="wregress" toolset="borland-5_5_1" result="success"/>
+    <test-result library="regex" test-name="wregress" toolset="borland-5_6_4" result="success"/>
+    <test-result library="regex" test-name="wregress" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="regex" test-name="wregress" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="regex" test-name="wregress" toolset="msvc" result="success"/>
     <test-result library="regex" test-name="wregress" toolset="msvc-stlport" result="success"/>
     <test-result library="regex" test-name="wregress" toolset="vc7" result="success"/>
-    <test-result library="regex" test-name="wregress" toolset="vc7.1" result="success"/>
-    <test-result library="signals" test-name="dead_slot_test" toolset="cw-8.3" result="success"/>
-    <test-result library="signals" test-name="dead_slot_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="signals" test-name="dead_slot_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="signals" test-name="dead_slot_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="signals" test-name="dead_slot_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="regex" test-name="wregress" toolset="vc-7_1" result="success"/>
+    <test-result library="signals" test-name="dead_slot_test" toolset="cw-8_3" result="success"/>
+    <test-result library="signals" test-name="dead_slot_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="signals" test-name="dead_slot_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="signals" test-name="dead_slot_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="signals" test-name="dead_slot_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="signals" test-name="dead_slot_test" toolset="msvc" result="success"/>
     <test-result library="signals" test-name="dead_slot_test" toolset="msvc-stlport" result="success"/>
     <test-result library="signals" test-name="dead_slot_test" toolset="vc7" result="success"/>
-    <test-result library="signals" test-name="dead_slot_test" toolset="vc7.1" result="success"/>
-    <test-result library="signals" test-name="deletion_test" toolset="cw-8.3" result="success"/>
-    <test-result library="signals" test-name="deletion_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="signals" test-name="deletion_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="signals" test-name="deletion_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="signals" test-name="deletion_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="signals" test-name="dead_slot_test" toolset="vc-7_1" result="success"/>
+    <test-result library="signals" test-name="deletion_test" toolset="cw-8_3" result="success"/>
+    <test-result library="signals" test-name="deletion_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="signals" test-name="deletion_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="signals" test-name="deletion_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="signals" test-name="deletion_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="signals" test-name="deletion_test" toolset="msvc" result="success"/>
     <test-result library="signals" test-name="deletion_test" toolset="msvc-stlport" result="success"/>
     <test-result library="signals" test-name="deletion_test" toolset="vc7" result="success"/>
-    <test-result library="signals" test-name="deletion_test" toolset="vc7.1" result="success"/>
-    <test-result library="signals" test-name="ordering_test" toolset="cw-8.3" result="success"/>
-    <test-result library="signals" test-name="ordering_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="signals" test-name="ordering_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="signals" test-name="ordering_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="signals" test-name="ordering_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="signals" test-name="deletion_test" toolset="vc-7_1" result="success"/>
+    <test-result library="signals" test-name="ordering_test" toolset="cw-8_3" result="success"/>
+    <test-result library="signals" test-name="ordering_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="signals" test-name="ordering_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="signals" test-name="ordering_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="signals" test-name="ordering_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="signals" test-name="ordering_test" toolset="msvc" result="success"/>
     <test-result library="signals" test-name="ordering_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="signals" test-name="ordering_test" toolset="vc7" result="success"/>
-    <test-result library="signals" test-name="ordering_test" toolset="vc7.1" result="success"/>
-    <test-result library="signals" test-name="signal_n_test" toolset="cw-8.3" result="success"/>
-    <test-result library="signals" test-name="signal_n_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="signals" test-name="signal_n_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="signals" test-name="signal_n_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="signals" test-name="signal_n_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="signals" test-name="ordering_test" toolset="vc-7_1" result="success"/>
+    <test-result library="signals" test-name="signal_n_test" toolset="cw-8_3" result="success"/>
+    <test-result library="signals" test-name="signal_n_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="signals" test-name="signal_n_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="signals" test-name="signal_n_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="signals" test-name="signal_n_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="signals" test-name="signal_n_test" toolset="msvc" result="success"/>
     <test-result library="signals" test-name="signal_n_test" toolset="msvc-stlport" result="success"/>
     <test-result library="signals" test-name="signal_n_test" toolset="vc7" result="success"/>
-    <test-result library="signals" test-name="signal_n_test" toolset="vc7.1" result="success"/>
-    <test-result library="signals" test-name="signal_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="signals" test-name="signal_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="signals" test-name="signal_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="signals" test-name="signal_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="signals" test-name="signal_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="signals" test-name="signal_n_test" toolset="vc-7_1" result="success"/>
+    <test-result library="signals" test-name="signal_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="signals" test-name="signal_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="signals" test-name="signal_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="signals" test-name="signal_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="signals" test-name="signal_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="signals" test-name="signal_test" toolset="msvc" result="fail"/>
     <test-result library="signals" test-name="signal_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="signals" test-name="signal_test" toolset="vc7" result="fail"/>
-    <test-result library="signals" test-name="signal_test" toolset="vc7.1" result="success"/>
-    <test-result library="signals" test-name="trackable_test" toolset="cw-8.3" result="success"/>
-    <test-result library="signals" test-name="trackable_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="signals" test-name="trackable_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="signals" test-name="trackable_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="signals" test-name="trackable_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="signals" test-name="signal_test" toolset="vc-7_1" result="success"/>
+    <test-result library="signals" test-name="trackable_test" toolset="cw-8_3" result="success"/>
+    <test-result library="signals" test-name="trackable_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="signals" test-name="trackable_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="signals" test-name="trackable_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="signals" test-name="trackable_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="signals" test-name="trackable_test" toolset="msvc" result="success"/>
     <test-result library="signals" test-name="trackable_test" toolset="msvc-stlport" result="success"/>
     <test-result library="signals" test-name="trackable_test" toolset="vc7" result="success"/>
-    <test-result library="signals" test-name="trackable_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="signals" test-name="trackable_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="get_deleter_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="get_deleter_test" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="get_deleter_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="get_deleter_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="intrusive_ptr_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_from_this_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_assign_fail" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_basic_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="shared_ptr_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="vc7.1" result="success"/>
-    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="cw-8.3" result="success"/>
-    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="smart_ptr_test" toolset="vc-7_1" result="success"/>
+    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="cw-8_3" result="success"/>
+    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="msvc" result="success"/>
     <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="msvc-stlport" result="success"/>
     <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="vc7" result="success"/>
-    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_1" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="smart_ptr" test-name="weak_ptr_test" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_1" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_1" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_1" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_1" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_1" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_2" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_1" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_2" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_2" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_2" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_2" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_2" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_3" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_example_3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_2" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_3" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_example_3" toolset="msvc" result="fail"/>
     <test-result library="static_assert" test-name="static_assert_example_3" toolset="msvc-stlport" result="fail"/>
     <test-result library="static_assert" test-name="static_assert_example_3" toolset="vc7" result="fail"/>
-    <test-result library="static_assert" test-name="static_assert_example_3" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="static_assert" test-name="static_assert_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_example_3" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="static_assert" test-name="static_assert_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_1" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_2" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_3" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="msvc" result="fail"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="msvc-stlport" result="fail"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_4" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_5" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="cw-8.3" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_6" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="cw-8_3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="vc7.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="cw-8.3" result="fail"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="borland-5.5.1" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="borland-5.6.4" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_7" toolset="vc-7_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="cw-8_3" result="fail"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="borland-5_5_1" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="borland-5_6_4" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="msvc" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="msvc-stlport" result="success"/>
     <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="vc7" result="success"/>
-    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="auto_unit_test_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="auto_unit_test_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="auto_unit_test_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="auto_unit_test_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="auto_unit_test_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="static_assert" test-name="static_assert_test_fail_8" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="auto_unit_test_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="auto_unit_test_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="auto_unit_test_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="auto_unit_test_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="auto_unit_test_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="auto_unit_test_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="auto_unit_test_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="auto_unit_test_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="auto_unit_test_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="errors_handling_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="test" test-name="errors_handling_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="test" test-name="errors_handling_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="test" test-name="errors_handling_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="test" test-name="errors_handling_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="test" test-name="auto_unit_test_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="errors_handling_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="test" test-name="errors_handling_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="test" test-name="errors_handling_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="test" test-name="errors_handling_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="test" test-name="errors_handling_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="test" test-name="errors_handling_test" toolset="msvc" result="fail"/>
     <test-result library="test" test-name="errors_handling_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="test" test-name="errors_handling_test" toolset="vc7" result="fail"/>
-    <test-result library="test" test-name="errors_handling_test" toolset="vc7.1" result="fail"/>
-    <test-result library="test" test-name="minimal_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="minimal_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="minimal_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="minimal_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="minimal_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="errors_handling_test" toolset="vc-7_1" result="fail"/>
+    <test-result library="test" test-name="minimal_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="minimal_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="minimal_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="minimal_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="minimal_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="minimal_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="minimal_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="minimal_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="minimal_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="online_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="online_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="online_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="online_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="online_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="minimal_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="online_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="online_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="online_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="online_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="online_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="online_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="online_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="online_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="online_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="output_test_stream_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="output_test_stream_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="output_test_stream_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="output_test_stream_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="output_test_stream_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="online_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="output_test_stream_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="output_test_stream_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="output_test_stream_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="output_test_stream_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="output_test_stream_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="output_test_stream_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="output_test_stream_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="output_test_stream_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="output_test_stream_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="parameterized_test_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="parameterized_test_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="parameterized_test_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="parameterized_test_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="parameterized_test_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="output_test_stream_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="parameterized_test_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="parameterized_test_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="parameterized_test_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="parameterized_test_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="parameterized_test_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="parameterized_test_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="parameterized_test_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="parameterized_test_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="parameterized_test_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail1" toolset="cw-8.3" result="fail"/>
-    <test-result library="test" test-name="prg_exec_fail1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="parameterized_test_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail1" toolset="cw-8_3" result="fail"/>
+    <test-result library="test" test-name="prg_exec_fail1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="prg_exec_fail1" toolset="msvc" result="success"/>
     <test-result library="test" test-name="prg_exec_fail1" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="prg_exec_fail1" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail1" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail2" toolset="cw-8.3" result="fail"/>
-    <test-result library="test" test-name="prg_exec_fail2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail1" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail2" toolset="cw-8_3" result="fail"/>
+    <test-result library="test" test-name="prg_exec_fail2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="prg_exec_fail2" toolset="msvc" result="success"/>
     <test-result library="test" test-name="prg_exec_fail2" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="prg_exec_fail2" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail2" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail3" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail2" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail3" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="prg_exec_fail3" toolset="msvc" result="success"/>
     <test-result library="test" test-name="prg_exec_fail3" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="prg_exec_fail3" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="prg_exec_fail3" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="result_report_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="result_report_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="result_report_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="result_report_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="result_report_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="prg_exec_fail3" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="result_report_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="result_report_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="result_report_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="result_report_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="result_report_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="result_report_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="result_report_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="result_report_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="result_report_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail1" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="test_exec_fail1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="test_exec_fail1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="test_exec_fail1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="result_report_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail1" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="test_exec_fail1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="test_exec_fail1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="test_exec_fail1" toolset="msvc" result="success"/>
     <test-result library="test" test-name="test_exec_fail1" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="test_exec_fail1" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="test_exec_fail1" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail2" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="test_exec_fail2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="test_exec_fail2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="test_exec_fail2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail1" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail2" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="test_exec_fail2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="test_exec_fail2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="test_exec_fail2" toolset="msvc" result="success"/>
     <test-result library="test" test-name="test_exec_fail2" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="test_exec_fail2" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="test_exec_fail2" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail3" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="test_exec_fail3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="test_exec_fail3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="test_exec_fail3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail2" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail3" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="test_exec_fail3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="test_exec_fail3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="test_exec_fail3" toolset="msvc" result="success"/>
     <test-result library="test" test-name="test_exec_fail3" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="test_exec_fail3" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="test_exec_fail3" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail4" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="test_exec_fail4" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="test_exec_fail4" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="test_exec_fail4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="test_exec_fail4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail3" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail4" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="test_exec_fail4" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="test_exec_fail4" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="test_exec_fail4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="test_exec_fail4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="test_exec_fail4" toolset="msvc" result="success"/>
     <test-result library="test" test-name="test_exec_fail4" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="test_exec_fail4" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="test_exec_fail4" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="test_fp_comparisons" toolset="cw-8.3" result="fail"/>
-    <test-result library="test" test-name="test_fp_comparisons" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="test" test-name="test_fp_comparisons" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="test" test-name="test_fp_comparisons" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="test" test-name="test_fp_comparisons" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="test" test-name="test_exec_fail4" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="test_fp_comparisons" toolset="cw-8_3" result="fail"/>
+    <test-result library="test" test-name="test_fp_comparisons" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="test" test-name="test_fp_comparisons" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="test" test-name="test_fp_comparisons" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="test" test-name="test_fp_comparisons" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="test" test-name="test_fp_comparisons" toolset="msvc" result="fail"/>
     <test-result library="test" test-name="test_fp_comparisons" toolset="msvc-stlport" result="fail"/>
     <test-result library="test" test-name="test_fp_comparisons" toolset="vc7" result="fail"/>
-    <test-result library="test" test-name="test_fp_comparisons" toolset="vc7.1" result="fail"/>
-    <test-result library="test" test-name="test_tools_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="test_tools_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="test_tools_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="test_tools_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="test_tools_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="test_fp_comparisons" toolset="vc-7_1" result="fail"/>
+    <test-result library="test" test-name="test_tools_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="test_tools_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="test_tools_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="test_tools_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="test_tools_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="test_tools_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="test_tools_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="test_tools_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="test_tools_test" toolset="vc7.1" result="success"/>
-    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="cw-8.3" result="success"/>
-    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="test_tools_test" toolset="vc-7_1" result="success"/>
+    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="cw-8_3" result="success"/>
+    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="test" test-name="unit_test_suite_ex_test" toolset="msvc" result="success"/>
     <test-result library="test" test-name="unit_test_suite_ex_test" toolset="msvc-stlport" result="success"/>
     <test-result library="test" test-name="unit_test_suite_ex_test" toolset="vc7" result="success"/>
-    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="vc7.1" result="success"/>
-    <test-result library="thread" test-name="test_condition" toolset="cw-8.3" result="success"/>
-    <test-result library="thread" test-name="test_condition" toolset="borland-5.5.1" result="success"/>
-    <test-result library="thread" test-name="test_condition" toolset="borland-5.6.4" result="success"/>
-    <test-result library="thread" test-name="test_condition" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="thread" test-name="test_condition" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="test" test-name="unit_test_suite_ex_test" toolset="vc-7_1" result="success"/>
+    <test-result library="thread" test-name="test_condition" toolset="cw-8_3" result="success"/>
+    <test-result library="thread" test-name="test_condition" toolset="borland-5_5_1" result="success"/>
+    <test-result library="thread" test-name="test_condition" toolset="borland-5_6_4" result="success"/>
+    <test-result library="thread" test-name="test_condition" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="thread" test-name="test_condition" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="thread" test-name="test_condition" toolset="msvc" result="success"/>
     <test-result library="thread" test-name="test_condition" toolset="msvc-stlport" result="success"/>
     <test-result library="thread" test-name="test_condition" toolset="vc7" result="success"/>
-    <test-result library="thread" test-name="test_condition" toolset="vc7.1" result="success"/>
-    <test-result library="thread" test-name="test_mutex" toolset="cw-8.3" result="success"/>
-    <test-result library="thread" test-name="test_mutex" toolset="borland-5.5.1" result="success"/>
-    <test-result library="thread" test-name="test_mutex" toolset="borland-5.6.4" result="success"/>
-    <test-result library="thread" test-name="test_mutex" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="thread" test-name="test_mutex" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="thread" test-name="test_condition" toolset="vc-7_1" result="success"/>
+    <test-result library="thread" test-name="test_mutex" toolset="cw-8_3" result="success"/>
+    <test-result library="thread" test-name="test_mutex" toolset="borland-5_5_1" result="success"/>
+    <test-result library="thread" test-name="test_mutex" toolset="borland-5_6_4" result="success"/>
+    <test-result library="thread" test-name="test_mutex" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="thread" test-name="test_mutex" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="thread" test-name="test_mutex" toolset="msvc" result="success"/>
     <test-result library="thread" test-name="test_mutex" toolset="msvc-stlport" result="success"/>
     <test-result library="thread" test-name="test_mutex" toolset="vc7" result="success"/>
-    <test-result library="thread" test-name="test_mutex" toolset="vc7.1" result="success"/>
-    <test-result library="thread" test-name="test_once" toolset="cw-8.3" result="success"/>
-    <test-result library="thread" test-name="test_once" toolset="borland-5.5.1" result="success"/>
-    <test-result library="thread" test-name="test_once" toolset="borland-5.6.4" result="success"/>
-    <test-result library="thread" test-name="test_once" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="thread" test-name="test_once" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="thread" test-name="test_mutex" toolset="vc-7_1" result="success"/>
+    <test-result library="thread" test-name="test_once" toolset="cw-8_3" result="success"/>
+    <test-result library="thread" test-name="test_once" toolset="borland-5_5_1" result="success"/>
+    <test-result library="thread" test-name="test_once" toolset="borland-5_6_4" result="success"/>
+    <test-result library="thread" test-name="test_once" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="thread" test-name="test_once" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="thread" test-name="test_once" toolset="msvc" result="success"/>
     <test-result library="thread" test-name="test_once" toolset="msvc-stlport" result="success"/>
     <test-result library="thread" test-name="test_once" toolset="vc7" result="success"/>
-    <test-result library="thread" test-name="test_once" toolset="vc7.1" result="success"/>
-    <test-result library="thread" test-name="test_thread" toolset="cw-8.3" result="success"/>
-    <test-result library="thread" test-name="test_thread" toolset="borland-5.5.1" result="success"/>
-    <test-result library="thread" test-name="test_thread" toolset="borland-5.6.4" result="success"/>
-    <test-result library="thread" test-name="test_thread" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="thread" test-name="test_thread" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="thread" test-name="test_once" toolset="vc-7_1" result="success"/>
+    <test-result library="thread" test-name="test_thread" toolset="cw-8_3" result="success"/>
+    <test-result library="thread" test-name="test_thread" toolset="borland-5_5_1" result="success"/>
+    <test-result library="thread" test-name="test_thread" toolset="borland-5_6_4" result="success"/>
+    <test-result library="thread" test-name="test_thread" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="thread" test-name="test_thread" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="thread" test-name="test_thread" toolset="msvc" result="success"/>
     <test-result library="thread" test-name="test_thread" toolset="msvc-stlport" result="success"/>
     <test-result library="thread" test-name="test_thread" toolset="vc7" result="success"/>
-    <test-result library="thread" test-name="test_thread" toolset="vc7.1" result="success"/>
-    <test-result library="thread" test-name="test_tss" toolset="cw-8.3" result="success"/>
-    <test-result library="thread" test-name="test_tss" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="thread" test-name="test_tss" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="thread" test-name="test_tss" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="thread" test-name="test_tss" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="thread" test-name="test_thread" toolset="vc-7_1" result="success"/>
+    <test-result library="thread" test-name="test_tss" toolset="cw-8_3" result="success"/>
+    <test-result library="thread" test-name="test_tss" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="thread" test-name="test_tss" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="thread" test-name="test_tss" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="thread" test-name="test_tss" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="thread" test-name="test_tss" toolset="msvc" result="success"/>
     <test-result library="thread" test-name="test_tss" toolset="msvc-stlport" result="success"/>
     <test-result library="thread" test-name="test_tss" toolset="vc7" result="success"/>
-    <test-result library="thread" test-name="test_tss" toolset="vc7.1" result="success"/>
-    <test-result library="thread" test-name="test_xtime" toolset="cw-8.3" result="success"/>
-    <test-result library="thread" test-name="test_xtime" toolset="borland-5.5.1" result="success"/>
-    <test-result library="thread" test-name="test_xtime" toolset="borland-5.6.4" result="success"/>
-    <test-result library="thread" test-name="test_xtime" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="thread" test-name="test_xtime" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="thread" test-name="test_tss" toolset="vc-7_1" result="success"/>
+    <test-result library="thread" test-name="test_xtime" toolset="cw-8_3" result="success"/>
+    <test-result library="thread" test-name="test_xtime" toolset="borland-5_5_1" result="success"/>
+    <test-result library="thread" test-name="test_xtime" toolset="borland-5_6_4" result="success"/>
+    <test-result library="thread" test-name="test_xtime" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="thread" test-name="test_xtime" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="thread" test-name="test_xtime" toolset="msvc" result="success"/>
     <test-result library="thread" test-name="test_xtime" toolset="msvc-stlport" result="success"/>
     <test-result library="thread" test-name="test_xtime" toolset="vc7" result="success"/>
-    <test-result library="thread" test-name="test_xtime" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="add_const_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="add_const_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="add_const_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="add_const_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="add_const_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="thread" test-name="test_xtime" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="add_const_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="add_const_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="add_const_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="add_const_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="add_const_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="add_const_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="add_const_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="add_const_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="add_const_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="add_pointer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="add_pointer_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="add_pointer_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="add_pointer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="add_pointer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="add_const_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="add_pointer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="add_pointer_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="add_pointer_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="add_pointer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="add_pointer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="add_pointer_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="add_pointer_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="add_pointer_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="add_pointer_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="add_reference_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="add_reference_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="add_reference_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="add_reference_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="add_reference_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="add_pointer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="add_reference_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="add_reference_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="add_reference_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="add_reference_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="add_reference_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="add_reference_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="add_reference_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="add_reference_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="add_reference_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="add_volatile_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="add_volatile_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="add_volatile_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="add_volatile_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="add_volatile_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="add_reference_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="add_volatile_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="add_volatile_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="add_volatile_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="add_volatile_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="add_volatile_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="add_volatile_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="add_volatile_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="add_volatile_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="add_volatile_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="alignment_of_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="type_traits" test-name="alignment_of_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="alignment_of_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="alignment_of_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="alignment_of_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="add_volatile_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="alignment_of_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="type_traits" test-name="alignment_of_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="alignment_of_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="alignment_of_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="alignment_of_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="alignment_of_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="alignment_of_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="alignment_of_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="alignment_of_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="function_traits_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="function_traits_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="function_traits_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="function_traits_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="function_traits_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="alignment_of_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="function_traits_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="function_traits_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="function_traits_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="function_traits_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="function_traits_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="function_traits_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="function_traits_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="function_traits_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="function_traits_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="function_traits_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_assign_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_constr_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="has_nothrow_copy_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_assign_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_constr_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_copy_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="has_trivial_destructor_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="is_arithmetic_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_arithmetic_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_arithmetic_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_array_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_array_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_array_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_array_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_array_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_arithmetic_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_array_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_array_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_array_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_array_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_array_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_array_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_array_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_array_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="is_array_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_array_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_class_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_class_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_class_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="is_class_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="is_class_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="is_base_and_derived_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_class_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_class_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_class_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="is_class_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="is_class_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="is_class_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_class_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_class_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="is_class_test" toolset="vc7.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_compound_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_compound_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_compound_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_compound_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_compound_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_class_test" toolset="vc-7_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_compound_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_compound_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_compound_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_compound_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_compound_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_compound_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_compound_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_compound_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_compound_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_const_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_const_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_const_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_const_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_const_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_compound_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_const_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_const_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_const_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_const_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_const_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_const_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_const_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_const_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="is_const_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_convertible_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_convertible_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_convertible_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="is_convertible_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_convertible_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_const_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_convertible_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_convertible_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_convertible_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="is_convertible_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_convertible_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_convertible_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_convertible_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_convertible_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_convertible_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_empty_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_empty_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_empty_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_empty_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_empty_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_convertible_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_empty_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_empty_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_empty_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_empty_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_empty_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_empty_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_empty_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_empty_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_empty_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_enum_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_enum_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_enum_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_enum_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_enum_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_empty_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_enum_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_enum_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_enum_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_enum_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_enum_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_enum_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_enum_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_enum_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_enum_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_float_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_float_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_float_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_float_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_float_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_enum_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_float_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_float_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_float_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_float_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_float_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_float_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_float_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_float_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_float_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_function_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_function_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_function_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_function_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_function_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_float_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_function_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_function_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_function_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_function_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_function_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_function_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_function_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_function_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_function_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_fundamental_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_fundamental_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_fundamental_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_fundamental_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="is_fundamental_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="is_function_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_fundamental_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_fundamental_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_fundamental_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_fundamental_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="is_fundamental_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="is_fundamental_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_fundamental_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_fundamental_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_fundamental_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_integral_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_integral_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_integral_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_integral_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="is_integral_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="is_fundamental_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_integral_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_integral_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_integral_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_integral_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="is_integral_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="is_integral_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_integral_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_integral_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_integral_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_member_func_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_member_func_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_member_func_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_member_func_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_member_func_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_integral_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_member_func_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_member_func_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_member_func_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_member_func_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_member_func_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_member_func_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_member_func_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_member_func_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_member_func_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_member_func_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_member_pointer_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_member_pointer_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_member_pointer_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_object_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_object_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_object_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_object_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_object_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_member_pointer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_object_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_object_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_object_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_object_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_object_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_object_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_object_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_object_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_object_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_pod_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_pod_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_pod_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_pod_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_pod_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_object_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_pod_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_pod_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_pod_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_pod_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_pod_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_pod_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_pod_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_pod_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_pod_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_pointer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_pointer_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_pointer_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_pointer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_pointer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_pod_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_pointer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_pointer_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_pointer_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_pointer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_pointer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_pointer_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_pointer_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_pointer_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_pointer_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="is_pointer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="is_polymorphic_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_polymorphic_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_polymorphic_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_reference_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_reference_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_reference_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_reference_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_reference_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_polymorphic_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_reference_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_reference_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_reference_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_reference_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_reference_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_reference_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_reference_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_reference_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="is_reference_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_same_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_same_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_same_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_same_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_same_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_reference_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_same_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_same_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_same_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_same_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_same_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_same_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_same_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_same_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_same_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_scalar_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_scalar_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_scalar_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_scalar_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_scalar_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_same_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_scalar_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_scalar_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_scalar_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_scalar_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_scalar_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_scalar_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_scalar_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_scalar_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_scalar_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_stateless_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_stateless_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_stateless_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_stateless_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_stateless_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_scalar_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_stateless_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_stateless_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_stateless_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_stateless_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_stateless_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_stateless_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_stateless_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_stateless_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_stateless_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_union_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_union_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_union_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="is_union_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="is_union_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="is_stateless_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_union_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_union_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_union_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="is_union_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="is_union_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="is_union_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_union_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_union_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="is_union_test" toolset="vc7.1" result="fail"/>
-    <test-result library="type_traits" test-name="is_void_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_void_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_void_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_void_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_void_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_union_test" toolset="vc-7_1" result="fail"/>
+    <test-result library="type_traits" test-name="is_void_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_void_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_void_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_void_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_void_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_void_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="is_void_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="is_void_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="is_void_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="is_volatile_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="is_volatile_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="is_volatile_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="is_volatile_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="is_volatile_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_void_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="is_volatile_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="is_volatile_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="is_volatile_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="is_volatile_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="is_volatile_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="is_volatile_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="is_volatile_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="is_volatile_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="is_volatile_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_bounds_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="remove_bounds_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="remove_bounds_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="remove_bounds_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="remove_bounds_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="is_volatile_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_bounds_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="remove_bounds_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="remove_bounds_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="remove_bounds_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="remove_bounds_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="remove_bounds_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="remove_bounds_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="remove_bounds_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="remove_bounds_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_const_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="remove_const_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="remove_const_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="remove_const_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="remove_const_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="remove_bounds_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_const_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="remove_const_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="remove_const_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="remove_const_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="remove_const_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="remove_const_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="remove_const_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="remove_const_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="remove_const_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_cv_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="remove_cv_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_cv_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="remove_cv_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="remove_cv_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="remove_const_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_cv_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="remove_cv_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_cv_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="remove_cv_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="remove_cv_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="remove_cv_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="remove_cv_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="remove_cv_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="remove_cv_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_pointer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="remove_pointer_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="remove_pointer_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="remove_pointer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="remove_pointer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="remove_cv_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_pointer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="remove_pointer_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="remove_pointer_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="remove_pointer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="remove_pointer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="remove_pointer_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="remove_pointer_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="remove_pointer_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="remove_pointer_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_reference_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="remove_reference_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_reference_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="remove_reference_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="remove_reference_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="remove_pointer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_reference_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="remove_reference_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_reference_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="remove_reference_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="remove_reference_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="remove_reference_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="remove_reference_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="remove_reference_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="remove_reference_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="remove_volatile_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="remove_volatile_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="remove_volatile_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="remove_volatile_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="remove_volatile_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="remove_reference_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="remove_volatile_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="remove_volatile_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="remove_volatile_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="remove_volatile_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="remove_volatile_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="remove_volatile_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="remove_volatile_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="remove_volatile_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="remove_volatile_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="remove_volatile_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_abstract_type_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_add_pointer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="tricky_function_type_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="tricky_function_type_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="tricky_function_type_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="type_traits" test-name="tricky_function_type_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="cw-8.3" result="success"/>
-    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_incomplete_type_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="cw-8_3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="msvc" result="fail"/>
     <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="vc7" result="fail"/>
-    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="vc7.1" result="success"/>
-    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="tricky_partial_spec_test" toolset="vc-7_1" result="success"/>
+    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="type_traits" test-name="type_with_alignment_test" toolset="msvc" result="success"/>
     <test-result library="type_traits" test-name="type_with_alignment_test" toolset="msvc-stlport" result="success"/>
     <test-result library="type_traits" test-name="type_with_alignment_test" toolset="vc7" result="success"/>
-    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="access" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="access" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="access" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="access" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="access" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="type_traits" test-name="type_with_alignment_test" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="access" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="access" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="access" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="access" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="access" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="access" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="access" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="access" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="access" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="addressof_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="addressof_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="addressof_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="addressof_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="addressof_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="access" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="addressof_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="addressof_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="addressof_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="addressof_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="addressof_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="addressof_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="addressof_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="addressof_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="addressof_test" toolset="vc7.1" result="success"/>
-    <test-result library="any" test-name="any_test" toolset="cw-8.3" result="success"/>
-    <test-result library="any" test-name="any_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="any" test-name="any_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="any" test-name="any_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="any" test-name="any_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="addressof_test" toolset="vc-7_1" result="success"/>
+    <test-result library="any" test-name="any_test" toolset="cw-8_3" result="success"/>
+    <test-result library="any" test-name="any_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="any" test-name="any_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="any" test-name="any_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="any" test-name="any_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="any" test-name="any_test" toolset="msvc" result="fail"/>
     <test-result library="any" test-name="any_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="any" test-name="any_test" toolset="vc7" result="fail"/>
-    <test-result library="any" test-name="any_test" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="any" test-name="any_test" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="arithmetic" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="arithmetic" toolset="msvc-stlport" result="fail"/>
     <test-result library="mpl" test-name="arithmetic" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="arithmetic" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="array" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="array" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="array" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="array" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="array" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="arithmetic" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="array" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="array" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="array" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="array" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="array" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="array" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="array" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="array" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="array" toolset="vc7.1" result="success"/>
-    <test-result library="array" test-name="array1" toolset="cw-8.3" result="success"/>
-    <test-result library="array" test-name="array1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="array" test-name="array1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="array" test-name="array1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="array" test-name="array1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="array" toolset="vc-7_1" result="success"/>
+    <test-result library="array" test-name="array1" toolset="cw-8_3" result="success"/>
+    <test-result library="array" test-name="array1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="array" test-name="array1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="array" test-name="array1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="array" test-name="array1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="array" test-name="array1" toolset="msvc" result="success"/>
     <test-result library="array" test-name="array1" toolset="msvc-stlport" result="success"/>
     <test-result library="array" test-name="array1" toolset="vc7" result="success"/>
-    <test-result library="array" test-name="array1" toolset="vc7.1" result="success"/>
-    <test-result library="array" test-name="array2" toolset="cw-8.3" result="success"/>
-    <test-result library="array" test-name="array2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="array" test-name="array2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="array" test-name="array2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="array" test-name="array2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="array" test-name="array1" toolset="vc-7_1" result="success"/>
+    <test-result library="array" test-name="array2" toolset="cw-8_3" result="success"/>
+    <test-result library="array" test-name="array2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="array" test-name="array2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="array" test-name="array2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="array" test-name="array2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="array" test-name="array2" toolset="msvc" result="success"/>
     <test-result library="array" test-name="array2" toolset="msvc-stlport" result="fail"/>
     <test-result library="array" test-name="array2" toolset="vc7" result="success"/>
-    <test-result library="array" test-name="array2" toolset="vc7.1" result="success"/>
-    <test-result library="array" test-name="array3" toolset="cw-8.3" result="success"/>
-    <test-result library="array" test-name="array3" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="array" test-name="array3" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="array" test-name="array3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="array" test-name="array3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="array" test-name="array2" toolset="vc-7_1" result="success"/>
+    <test-result library="array" test-name="array3" toolset="cw-8_3" result="success"/>
+    <test-result library="array" test-name="array3" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="array" test-name="array3" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="array" test-name="array3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="array" test-name="array3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="array" test-name="array3" toolset="msvc" result="fail"/>
     <test-result library="array" test-name="array3" toolset="msvc-stlport" result="fail"/>
     <test-result library="array" test-name="array3" toolset="vc7" result="fail"/>
-    <test-result library="array" test-name="array3" toolset="vc7.1" result="success"/>
-    <test-result library="array" test-name="array4" toolset="cw-8.3" result="success"/>
-    <test-result library="array" test-name="array4" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="array" test-name="array4" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="array" test-name="array4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="array" test-name="array4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="array" test-name="array3" toolset="vc-7_1" result="success"/>
+    <test-result library="array" test-name="array4" toolset="cw-8_3" result="success"/>
+    <test-result library="array" test-name="array4" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="array" test-name="array4" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="array" test-name="array4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="array" test-name="array4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="array" test-name="array4" toolset="msvc" result="fail"/>
     <test-result library="array" test-name="array4" toolset="msvc-stlport" result="fail"/>
     <test-result library="array" test-name="array4" toolset="vc7" result="fail"/>
-    <test-result library="array" test-name="array4" toolset="vc7.1" result="success"/>
-    <test-result library="array" test-name="array5" toolset="cw-8.3" result="success"/>
-    <test-result library="array" test-name="array5" toolset="borland-5.5.1" result="success"/>
-    <test-result library="array" test-name="array5" toolset="borland-5.6.4" result="success"/>
-    <test-result library="array" test-name="array5" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="array" test-name="array5" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="array" test-name="array4" toolset="vc-7_1" result="success"/>
+    <test-result library="array" test-name="array5" toolset="cw-8_3" result="success"/>
+    <test-result library="array" test-name="array5" toolset="borland-5_5_1" result="success"/>
+    <test-result library="array" test-name="array5" toolset="borland-5_6_4" result="success"/>
+    <test-result library="array" test-name="array5" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="array" test-name="array5" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="array" test-name="array5" toolset="msvc" result="success"/>
     <test-result library="array" test-name="array5" toolset="msvc-stlport" result="success"/>
     <test-result library="array" test-name="array5" toolset="vc7" result="success"/>
-    <test-result library="array" test-name="array5" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="assign" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="assign" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="assign" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="assign" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="assign" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="array" test-name="array5" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="assign" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="assign" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="assign" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="assign" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="assign" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="assign" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="assign" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="assign" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="assign" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="binary_search_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="binary_search_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="binary_search_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="binary_search_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="utility" test-name="binary_search_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="assign" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="binary_search_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="binary_search_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="binary_search_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="binary_search_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="utility" test-name="binary_search_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="binary_search_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="binary_search_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="binary_search_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="binary_search_test" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_advanced" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_advanced" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_advanced" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_advanced" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_advanced" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="utility" test-name="binary_search_test" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_advanced" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_advanced" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_advanced" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_advanced" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_advanced" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_advanced" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_advanced" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_advanced" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_advanced" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_simple" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_simple" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_simple" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_simple" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_simple" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_advanced" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_simple" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_simple" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="lambda" test-name="bind_tests_simple" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_simple" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_simple" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_simple" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="bll_and_function" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="bll_and_function" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="bll_and_function" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="bll_and_function" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="bll_and_function" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="lambda" test-name="bind_tests_simple_f_refs" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="bll_and_function" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="bll_and_function" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="bll_and_function" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="bll_and_function" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="bll_and_function" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="bll_and_function" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="bll_and_function" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="bll_and_function" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="bll_and_function" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="call_traits_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="call_traits_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="call_traits_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="utility" test-name="call_traits_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="call_traits_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="bll_and_function" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="call_traits_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="call_traits_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="call_traits_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="utility" test-name="call_traits_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="call_traits_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="call_traits_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="call_traits_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="utility" test-name="call_traits_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="call_traits_test" toolset="vc7.1" result="success"/>
-    <test-result library="conversion" test-name="cast_test" toolset="cw-8.3" result="success"/>
-    <test-result library="conversion" test-name="cast_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="conversion" test-name="cast_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="conversion" test-name="cast_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="conversion" test-name="cast_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="call_traits_test" toolset="vc-7_1" result="success"/>
+    <test-result library="conversion" test-name="cast_test" toolset="cw-8_3" result="success"/>
+    <test-result library="conversion" test-name="cast_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="conversion" test-name="cast_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="conversion" test-name="cast_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="conversion" test-name="cast_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="conversion" test-name="cast_test" toolset="msvc" result="success"/>
     <test-result library="conversion" test-name="cast_test" toolset="msvc-stlport" result="success"/>
     <test-result library="conversion" test-name="cast_test" toolset="vc7" result="success"/>
-    <test-result library="conversion" test-name="cast_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="checked_delete_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="checked_delete_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="checked_delete_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="checked_delete_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="checked_delete_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="conversion" test-name="cast_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="checked_delete_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="checked_delete_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="checked_delete_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="checked_delete_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="checked_delete_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="checked_delete_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="checked_delete_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="checked_delete_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="checked_delete_test" toolset="vc7.1" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_check_test" toolset="cw-8.3" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_check_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_check_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_check_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_check_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="checked_delete_test" toolset="vc-7_1" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_check_test" toolset="cw-8_3" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_check_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_check_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_check_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_check_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="concept_check" test-name="class_concept_check_test" toolset="msvc" result="success"/>
     <test-result library="concept_check" test-name="class_concept_check_test" toolset="msvc-stlport" result="success"/>
     <test-result library="concept_check" test-name="class_concept_check_test" toolset="vc7" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_check_test" toolset="vc7.1" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="cw-8.3" result="fail"/>
-    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_check_test" toolset="vc-7_1" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="cw-8_3" result="fail"/>
+    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="msvc" result="fail"/>
     <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="msvc-stlport" result="fail"/>
     <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="vc7" result="fail"/>
-    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="compare" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="compare" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="compare" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="compare" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="compare" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="concept_check" test-name="class_concept_fail_expected" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="compare" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="compare" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="compare" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="compare" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="compare" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="compare" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="compare" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="compare" toolset="vc7" result="fail"/>
-    <test-result library="multi_array" test-name="compare" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="compare" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="comparison" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="comparison" toolset="msvc-stlport" result="fail"/>
     <test-result library="mpl" test-name="comparison" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="comparison" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="compressed_pair_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="compressed_pair_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="compressed_pair_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="compressed_pair_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="compressed_pair_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="comparison" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="compressed_pair_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="compressed_pair_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="compressed_pair_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="compressed_pair_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="compressed_pair_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="compressed_pair_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="compressed_pair_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="compressed_pair_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="compressed_pair_test" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="concepts" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/ublas" test-name="concepts" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="concepts" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="concepts" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/ublas" test-name="concepts" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="compressed_pair_test" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="concepts" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/ublas" test-name="concepts" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="concepts" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="concepts" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/ublas" test-name="concepts" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="numeric/ublas" test-name="concepts" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="concepts" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="concepts" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="concepts" toolset="vc7.1" result="fail"/>
-    <test-result library="multi_array" test-name="concept_checks" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="concept_checks" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="concept_checks" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="concept_checks" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="concept_checks" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/ublas" test-name="concepts" toolset="vc-7_1" result="fail"/>
+    <test-result library="multi_array" test-name="concept_checks" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="concept_checks" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="concept_checks" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="concept_checks" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="concept_checks" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="concept_checks" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="concept_checks" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="concept_checks" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="concept_checks" toolset="vc7.1" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="cw-8.3" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="borland-5.5.1" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="borland-5.6.4" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="concept_checks" toolset="vc-7_1" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="cw-8_3" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="borland-5_5_1" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="borland-5_6_4" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="msvc" result="success"/>
     <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="msvc-stlport" result="success"/>
     <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="vc7" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="vc7.1" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_test" toolset="cw-8.3" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_fail_expected" toolset="vc-7_1" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_test" toolset="cw-8_3" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="concept_check" test-name="concept_check_test" toolset="msvc" result="success"/>
     <test-result library="concept_check" test-name="concept_check_test" toolset="msvc-stlport" result="success"/>
     <test-result library="concept_check" test-name="concept_check_test" toolset="vc7" result="success"/>
-    <test-result library="concept_check" test-name="concept_check_test" toolset="vc7.1" result="success"/>
-    <test-result library="config" test-name="config_info" toolset="cw-8.3" result="success"/>
-    <test-result library="config" test-name="config_info" toolset="borland-5.5.1" result="success"/>
-    <test-result library="config" test-name="config_info" toolset="borland-5.6.4" result="success"/>
-    <test-result library="config" test-name="config_info" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="config" test-name="config_info" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="concept_check" test-name="concept_check_test" toolset="vc-7_1" result="success"/>
+    <test-result library="config" test-name="config_info" toolset="cw-8_3" result="success"/>
+    <test-result library="config" test-name="config_info" toolset="borland-5_5_1" result="success"/>
+    <test-result library="config" test-name="config_info" toolset="borland-5_6_4" result="success"/>
+    <test-result library="config" test-name="config_info" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="config" test-name="config_info" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="config" test-name="config_info" toolset="msvc" result="success"/>
     <test-result library="config" test-name="config_info" toolset="msvc-stlport" result="success"/>
     <test-result library="config" test-name="config_info" toolset="vc7" result="success"/>
-    <test-result library="config" test-name="config_info" toolset="vc7.1" result="success"/>
-    <test-result library="config" test-name="config_test" toolset="cw-8.3" result="success"/>
-    <test-result library="config" test-name="config_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="config" test-name="config_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="config" test-name="config_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="config" test-name="config_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="config" test-name="config_info" toolset="vc-7_1" result="success"/>
+    <test-result library="config" test-name="config_test" toolset="cw-8_3" result="success"/>
+    <test-result library="config" test-name="config_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="config" test-name="config_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="config" test-name="config_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="config" test-name="config_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="config" test-name="config_test" toolset="msvc" result="success"/>
     <test-result library="config" test-name="config_test" toolset="msvc-stlport" result="success"/>
     <test-result library="config" test-name="config_test" toolset="vc7" result="success"/>
-    <test-result library="config" test-name="config_test" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="constructors" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="constructors" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="constructors" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="constructors" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="constructors" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="config" test-name="config_test" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="constructors" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="constructors" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="constructors" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="constructors" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="constructors" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="constructors" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="constructors" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="constructors" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="constructors" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="constructor_tests" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="constructor_tests" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="constructor_tests" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="constructor_tests" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="constructor_tests" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="constructors" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="constructor_tests" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="constructor_tests" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="constructor_tests" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="constructor_tests" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="constructor_tests" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="constructor_tests" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="constructor_tests" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="constructor_tests" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="constructor_tests" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="control" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="control" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="control" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="control" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="control" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="constructor_tests" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="control" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="control" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="control" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="control" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="control" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="control" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="control" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="control" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="control" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="control_structures" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="control_structures" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="control_structures" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="control_structures" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="control_structures" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="preprocessor" test-name="control" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="control_structures" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="control_structures" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="control_structures" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="control_structures" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="control_structures" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="control_structures" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="control_structures" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="control_structures" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="control_structures" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="control_structures" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="counting_iterator_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="counting_iterator_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="counting_iterator_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_example" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_example" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="counting_iterator_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="counting_iterator_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="utility" test-name="counting_iterator_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="counting_iterator_test" toolset="vc7.1" result="success"/>
-    <test-result library="crc" test-name="crc_test" toolset="cw-8.3" result="success"/>
-    <test-result library="crc" test-name="crc_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="crc" test-name="crc_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="crc" test-name="crc_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="crc" test-name="crc_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="counting_iterator_test" toolset="vc-7_1" result="success"/>
+    <test-result library="crc" test-name="crc_test" toolset="cw-8_3" result="success"/>
+    <test-result library="crc" test-name="crc_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="crc" test-name="crc_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="crc" test-name="crc_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="crc" test-name="crc_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="crc" test-name="crc_test" toolset="msvc" result="success"/>
     <test-result library="crc" test-name="crc_test" toolset="msvc-stlport" result="success"/>
     <test-result library="crc" test-name="crc_test" toolset="vc7" result="success"/>
-    <test-result library="crc" test-name="crc_test" toolset="vc7.1" result="success"/>
-    <test-result library="integer" test-name="cstdint_test" toolset="cw-8.3" result="success"/>
-    <test-result library="integer" test-name="cstdint_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="integer" test-name="cstdint_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="integer" test-name="cstdint_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="integer" test-name="cstdint_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="crc" test-name="crc_test" toolset="vc-7_1" result="success"/>
+    <test-result library="integer" test-name="cstdint_test" toolset="cw-8_3" result="success"/>
+    <test-result library="integer" test-name="cstdint_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="integer" test-name="cstdint_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="integer" test-name="cstdint_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="integer" test-name="cstdint_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="integer" test-name="cstdint_test" toolset="msvc" result="success"/>
     <test-result library="integer" test-name="cstdint_test" toolset="msvc-stlport" result="success"/>
     <test-result library="integer" test-name="cstdint_test" toolset="vc7" result="success"/>
-    <test-result library="integer" test-name="cstdint_test" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="debug" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="debug" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="debug" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="debug" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="debug" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="integer" test-name="cstdint_test" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="debug" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="debug" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="debug" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="debug" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="debug" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="debug" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="debug" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="debug" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="debug" toolset="vc7.1" result="success"/>
-    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="cw-8.3" result="success"/>
-    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="debug" toolset="vc-7_1" result="success"/>
+    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="cw-8_3" result="success"/>
+    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="msvc" result="success"/>
     <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="msvc-stlport" result="success"/>
     <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="vc7" result="success"/>
-    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="vc7.1" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="cw-8.3" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="disjoint_sets" test-name="disjoint_set_test" toolset="vc-7_1" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="cw-8_3" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="msvc" result="success"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="msvc-stlport" result="fail"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="vc7" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="vc7.1" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="cw-8.3" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests1" toolset="vc-7_1" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="cw-8_3" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="msvc" result="success"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="msvc-stlport" result="fail"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="vc7" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="vc7.1" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="cw-8.3" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests2" toolset="vc-7_1" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="cw-8_3" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="msvc" result="success"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="msvc-stlport" result="fail"/>
     <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="vc7" result="success"/>
-    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="vc7.1" result="success"/>
-    <test-result library="tokenizer" test-name="examples" toolset="cw-8.3" result="success"/>
-    <test-result library="tokenizer" test-name="examples" toolset="borland-5.5.1" result="success"/>
-    <test-result library="tokenizer" test-name="examples" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tokenizer" test-name="examples" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tokenizer" test-name="examples" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="dynamic_bitset" test-name="dyn_bitset_unit_tests3" toolset="vc-7_1" result="success"/>
+    <test-result library="tokenizer" test-name="examples" toolset="cw-8_3" result="success"/>
+    <test-result library="tokenizer" test-name="examples" toolset="borland-5_5_1" result="success"/>
+    <test-result library="tokenizer" test-name="examples" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tokenizer" test-name="examples" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tokenizer" test-name="examples" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tokenizer" test-name="examples" toolset="msvc" result="success"/>
     <test-result library="tokenizer" test-name="examples" toolset="msvc-stlport" result="success"/>
     <test-result library="tokenizer" test-name="examples" toolset="vc7" result="success"/>
-    <test-result library="tokenizer" test-name="examples" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="exception_test" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="exception_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="exception_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="exception_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="exception_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="tokenizer" test-name="examples" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="exception_test" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="exception_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="exception_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="exception_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="exception_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="exception_test" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="exception_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="exception_test" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="exception_test" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="extending_rt_traits" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="extending_rt_traits" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="extending_rt_traits" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="extending_rt_traits" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="extending_rt_traits" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="lambda" test-name="exception_test" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="extending_rt_traits" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="extending_rt_traits" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="extending_rt_traits" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="extending_rt_traits" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="extending_rt_traits" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="extending_rt_traits" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="extending_rt_traits" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="extending_rt_traits" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="extending_rt_traits" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="facilities" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="facilities" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="facilities" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="facilities" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="facilities" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="extending_rt_traits" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="facilities" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="facilities" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="facilities" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="facilities" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="facilities" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="facilities" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="facilities" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="facilities" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="facilities" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cbracket" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_cbracket" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cbracket" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_cbracket" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_cbracket" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="facilities" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cbracket" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cbracket" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cbracket" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_cbracket" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_cbracket" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_cbracket" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_cbracket" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_cbracket" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_cbracket" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cdata" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_cdata" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cdata" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_cdata" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="multi_array" test-name="fail_cdata" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="fail_cbracket" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cdata" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cdata" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cdata" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_cdata" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="multi_array" test-name="fail_cdata" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="multi_array" test-name="fail_cdata" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_cdata" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_cdata" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_cdata" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_citerator" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_citerator" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_citerator" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_citerator" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="multi_array" test-name="fail_citerator" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="fail_cdata" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_citerator" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_citerator" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_citerator" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_citerator" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="multi_array" test-name="fail_citerator" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="multi_array" test-name="fail_citerator" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_citerator" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_citerator" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_citerator" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cparen" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_cparen" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cparen" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_cparen" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_cparen" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_citerator" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cparen" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cparen" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cparen" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_cparen" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_cparen" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_cparen" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_cparen" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_cparen" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_cparen" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_criterator" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_criterator" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_criterator" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_criterator" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="multi_array" test-name="fail_criterator" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="fail_cparen" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_criterator" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_criterator" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_criterator" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_criterator" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="multi_array" test-name="fail_criterator" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="multi_array" test-name="fail_criterator" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_criterator" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_criterator" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_criterator" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_criterator" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray2" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray2" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray2" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray2" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray2" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray2" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray3" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray2" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray3" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray3" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray3" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_csubarray3" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_csubarray3" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_csubarray3" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_cview" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_cview" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_cview" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview2" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview2" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_cview2" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_cview2" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_cview2" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview2" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview3" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview2" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview3" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_cview3" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_cview3" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_cview3" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_cview3" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_cview3" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="fail_ref_cbracket" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="multi_array" test-name="fail_ref_cdata" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cdata" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cdata" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="fail_ref_cdata" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="multi_array" test-name="fail_ref_citerator" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_citerator" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_citerator" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_citerator" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cparen" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cparen" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cparen" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="fail_ref_cparen" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="multi_array" test-name="fail_ref_criterator" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_criterator" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_criterator" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_criterator" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray2" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_csubarray3" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview2" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview2" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview2" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview2" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview3" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview3" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="fail_ref_cview3" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="filter_iterator_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="filter_iterator_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="filter_iterator_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="filter_iterator_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="filter_iterator_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="fail_ref_cview3" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="filter_iterator_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="filter_iterator_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="filter_iterator_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="filter_iterator_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="filter_iterator_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="filter_iterator_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="filter_iterator_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="filter_iterator_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="filter_iterator_example" toolset="vc7.1" result="success"/>
-    <test-result library="functional" test-name="function_test" toolset="cw-8.3" result="success"/>
-    <test-result library="functional" test-name="function_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="functional" test-name="function_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="functional" test-name="function_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="functional" test-name="function_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="filter_iterator_example" toolset="vc-7_1" result="success"/>
+    <test-result library="functional" test-name="function_test" toolset="cw-8_3" result="success"/>
+    <test-result library="functional" test-name="function_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="functional" test-name="function_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="functional" test-name="function_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="functional" test-name="function_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="functional" test-name="function_test" toolset="msvc" result="success"/>
     <test-result library="functional" test-name="function_test" toolset="msvc-stlport" result="success"/>
     <test-result library="functional" test-name="function_test" toolset="vc7" result="success"/>
-    <test-result library="functional" test-name="function_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="fun_out_iter_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="fun_out_iter_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="fun_out_iter_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="fun_out_iter_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="fun_out_iter_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="functional" test-name="function_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="fun_out_iter_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="fun_out_iter_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="fun_out_iter_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="fun_out_iter_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="fun_out_iter_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="fun_out_iter_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="fun_out_iter_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="fun_out_iter_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="fun_out_iter_example" toolset="vc7.1" result="success"/>
-    <test-result library="graph" test-name="adj_list_cc" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
-    <test-result library="graph" test-name="bfs" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
-    <test-result library="graph" test-name="subgraph" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
-    <test-result library="graph" test-name="adj_matrix_cc" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="graph" test-name="edge_list_cc" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="graph" test-name="isomorphism" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="graph" test-name="graph" toolset="cw-8.3" result="fail"/>
-    <test-result library="graph" test-name="graph" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="graph" test-name="graph" toolset="borland-5.6.4" result="success"/>
-    <test-result library="graph" test-name="graph" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="graph" test-name="graph" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="fun_out_iter_example" toolset="vc-7_1" result="success"/>
+    <test-result library="graph" test-name="adj_list_cc" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
+    <test-result library="graph" test-name="bfs" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
+    <test-result library="graph" test-name="subgraph" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
+    <test-result library="graph" test-name="adj_matrix_cc" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="graph" test-name="edge_list_cc" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="graph" test-name="isomorphism" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="graph" test-name="graph" toolset="cw-8_3" result="fail"/>
+    <test-result library="graph" test-name="graph" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="graph" test-name="graph" toolset="borland-5_6_4" result="success"/>
+    <test-result library="graph" test-name="graph" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="graph" test-name="graph" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="graph" test-name="graph" toolset="msvc" result="fail"/>
     <test-result library="graph" test-name="graph" toolset="msvc-stlport" result="fail"/>
     <test-result library="graph" test-name="graph" toolset="vc7" result="success"/>
-    <test-result library="graph" test-name="graph" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="idxgen1" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="idxgen1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="multi_array" test-name="idxgen1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="multi_array" test-name="idxgen1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="idxgen1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="graph" test-name="graph" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="idxgen1" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="idxgen1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="multi_array" test-name="idxgen1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="multi_array" test-name="idxgen1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="idxgen1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="idxgen1" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="idxgen1" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="idxgen1" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="idxgen1" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="index_bases" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="index_bases" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="index_bases" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="index_bases" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="index_bases" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="idxgen1" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="index_bases" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="index_bases" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="index_bases" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="index_bases" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="index_bases" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="index_bases" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="index_bases" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="index_bases" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="index_bases" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="index_bases" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="indirect_iterator_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="indirect_iterator_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="indirect_iterator_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_example" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_example" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="indirect_iterator_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="indirect_iterator_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="indirect_iterator_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="indirect_iterator_test" toolset="vc7.1" result="success"/>
-    <test-result library="integer" test-name="integer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="integer" test-name="integer_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="integer" test-name="integer_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="integer" test-name="integer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="integer" test-name="integer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="indirect_iterator_test" toolset="vc-7_1" result="success"/>
+    <test-result library="integer" test-name="integer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="integer" test-name="integer_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="integer" test-name="integer_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="integer" test-name="integer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="integer" test-name="integer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="integer" test-name="integer_test" toolset="msvc" result="success"/>
     <test-result library="integer" test-name="integer_test" toolset="msvc-stlport" result="success"/>
     <test-result library="integer" test-name="integer_test" toolset="vc7" result="success"/>
-    <test-result library="integer" test-name="integer_test" toolset="vc7.1" result="success"/>
-    <test-result library="integer" test-name="integer_traits_test" toolset="cw-8.3" result="success"/>
-    <test-result library="integer" test-name="integer_traits_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="integer" test-name="integer_traits_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="integer" test-name="integer_traits_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="integer" test-name="integer_traits_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="integer" test-name="integer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="integer" test-name="integer_traits_test" toolset="cw-8_3" result="success"/>
+    <test-result library="integer" test-name="integer_traits_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="integer" test-name="integer_traits_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="integer" test-name="integer_traits_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="integer" test-name="integer_traits_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="integer" test-name="integer_traits_test" toolset="msvc" result="success"/>
     <test-result library="integer" test-name="integer_traits_test" toolset="msvc-stlport" result="success"/>
     <test-result library="integer" test-name="integer_traits_test" toolset="vc7" result="success"/>
-    <test-result library="integer" test-name="integer_traits_test" toolset="vc7.1" result="success"/>
-    <test-result library="io" test-name="ios_state_test" toolset="cw-8.3" result="success"/>
-    <test-result library="io" test-name="ios_state_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="io" test-name="ios_state_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="io" test-name="ios_state_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="io" test-name="ios_state_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="integer" test-name="integer_traits_test" toolset="vc-7_1" result="success"/>
+    <test-result library="io" test-name="ios_state_test" toolset="cw-8_3" result="success"/>
+    <test-result library="io" test-name="ios_state_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="io" test-name="ios_state_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="io" test-name="ios_state_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="io" test-name="ios_state_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="io" test-name="ios_state_test" toolset="msvc" result="fail"/>
     <test-result library="io" test-name="ios_state_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="io" test-name="ios_state_test" toolset="vc7" result="success"/>
-    <test-result library="io" test-name="ios_state_test" toolset="vc7.1" result="success"/>
-    <test-result library="tuple" test-name="io_test" toolset="cw-8.3" result="success"/>
-    <test-result library="tuple" test-name="io_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="tuple" test-name="io_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tuple" test-name="io_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tuple" test-name="io_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="io" test-name="ios_state_test" toolset="vc-7_1" result="success"/>
+    <test-result library="tuple" test-name="io_test" toolset="cw-8_3" result="success"/>
+    <test-result library="tuple" test-name="io_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="tuple" test-name="io_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tuple" test-name="io_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tuple" test-name="io_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tuple" test-name="io_test" toolset="msvc" result="success"/>
     <test-result library="tuple" test-name="io_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="tuple" test-name="io_test" toolset="vc7" result="success"/>
-    <test-result library="tuple" test-name="io_test" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="is_instance_of_test" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="is_instance_of_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="lambda" test-name="is_instance_of_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="lambda" test-name="is_instance_of_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="lambda" test-name="is_instance_of_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="tuple" test-name="io_test" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="is_instance_of_test" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="is_instance_of_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="lambda" test-name="is_instance_of_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="lambda" test-name="is_instance_of_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="lambda" test-name="is_instance_of_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="lambda" test-name="is_instance_of_test" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="is_instance_of_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="is_instance_of_test" toolset="vc7" result="success"/>
-    <test-result library="lambda" test-name="is_instance_of_test" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="iteration" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="iteration" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="iteration" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="iteration" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="iteration" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="is_instance_of_test" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="iteration" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="iteration" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="iteration" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="iteration" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="iteration" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="iteration" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="iteration" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="iteration" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="iteration" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="iterators" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="iterators" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="iterators" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="iterators" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="iterators" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="iteration" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="iterators" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="iterators" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="iterators" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="iterators" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="iterators" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="iterators" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="iterators" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="iterators" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="iterators" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iterators_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iterators_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iterators_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iterators_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="iterators_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="iterators" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iterators_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iterators_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iterators_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iterators_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="iterators_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="iterators_test" toolset="msvc" result="fail"/>
     <test-result library="utility" test-name="iterators_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="utility" test-name="iterators_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iterators_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="iterators_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="iterator_adaptor_examples" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="iterator_adaptor_examples" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="iterator_adaptor_examples" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="utility" test-name="iterator_adaptor_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="utility" test-name="iterator_adaptor_examples" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="utility" test-name="iterator_adaptor_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="utility" test-name="iterator_adaptor_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="iterator_adaptor_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="utility" test-name="iterator_adaptor_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iterator_adaptor_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iterator_traits_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iterator_traits_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iterator_traits_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iterator_traits_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="iterator_traits_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="iterator_adaptor_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iterator_traits_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iterator_traits_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iterator_traits_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iterator_traits_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="iterator_traits_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="iterator_traits_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="iterator_traits_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="iterator_traits_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iterator_traits_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="utility" test-name="iterator_traits_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="msvc-stlport" result="fail"/>
     <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected1" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="iter_traits_gen_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="iter_traits_gen_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="iter_traits_gen_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="iter_traits_gen_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="iter_traits_gen_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="iter_adaptor_fail_expected2" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="iter_traits_gen_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="iter_traits_gen_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="iter_traits_gen_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="iter_traits_gen_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="iter_traits_gen_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="iter_traits_gen_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="iter_traits_gen_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="iter_traits_gen_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="iter_traits_gen_test" toolset="vc7.1" result="success"/>
-    <test-result library="conversion" test-name="lexical_cast_test" toolset="cw-8.3" result="success"/>
-    <test-result library="conversion" test-name="lexical_cast_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="conversion" test-name="lexical_cast_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="conversion" test-name="lexical_cast_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="conversion" test-name="lexical_cast_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="iter_traits_gen_test" toolset="vc-7_1" result="success"/>
+    <test-result library="conversion" test-name="lexical_cast_test" toolset="cw-8_3" result="success"/>
+    <test-result library="conversion" test-name="lexical_cast_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="conversion" test-name="lexical_cast_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="conversion" test-name="lexical_cast_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="conversion" test-name="lexical_cast_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="conversion" test-name="lexical_cast_test" toolset="msvc" result="success"/>
     <test-result library="conversion" test-name="lexical_cast_test" toolset="msvc-stlport" result="success"/>
     <test-result library="conversion" test-name="lexical_cast_test" toolset="vc7" result="success"/>
-    <test-result library="conversion" test-name="lexical_cast_test" toolset="vc7.1" result="success"/>
-    <test-result library="config" test-name="limits_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="config" test-name="limits_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="config" test-name="limits_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="config" test-name="limits_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="config" test-name="limits_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="conversion" test-name="lexical_cast_test" toolset="vc-7_1" result="success"/>
+    <test-result library="config" test-name="limits_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="config" test-name="limits_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="config" test-name="limits_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="config" test-name="limits_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="config" test-name="limits_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="config" test-name="limits_test" toolset="msvc" result="fail"/>
     <test-result library="config" test-name="limits_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="config" test-name="limits_test" toolset="vc7" result="success"/>
-    <test-result library="config" test-name="limits_test" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="config" test-name="limits_test" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="list" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="list" toolset="msvc-stlport" result="fail"/>
     <test-result library="mpl" test-name="list" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="list" toolset="vc7.1" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="cw-8.3" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="borland-5.5.1" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="borland-5.6.4" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="mpl" test-name="list" toolset="vc-7_1" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="cw-8_3" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="borland-5_5_1" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="borland-5_6_4" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="mpl" test-name="logical" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="mpl" test-name="logical" toolset="msvc" result="success"/>
     <test-result library="mpl" test-name="logical" toolset="msvc-stlport" result="fail"/>
     <test-result library="mpl" test-name="logical" toolset="vc7" result="success"/>
-    <test-result library="mpl" test-name="logical" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="member_pointer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="member_pointer_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="member_pointer_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="member_pointer_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="member_pointer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="mpl" test-name="logical" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="member_pointer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="member_pointer_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="member_pointer_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="member_pointer_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="member_pointer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="member_pointer_test" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="member_pointer_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="member_pointer_test" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="member_pointer_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="noncopyable_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="noncopyable_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="noncopyable_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="noncopyable_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="noncopyable_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="member_pointer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="noncopyable_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="noncopyable_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="noncopyable_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="noncopyable_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="noncopyable_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="noncopyable_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="noncopyable_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="noncopyable_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="noncopyable_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="numeric_traits_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="numeric_traits_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="numeric_traits_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="utility" test-name="numeric_traits_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="numeric_traits_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="noncopyable_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="numeric_traits_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="numeric_traits_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="numeric_traits_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="utility" test-name="numeric_traits_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="numeric_traits_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="numeric_traits_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="numeric_traits_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="utility" test-name="numeric_traits_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="numeric_traits_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="operators_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="operators_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="utility" test-name="operators_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="operators_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="operators_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="numeric_traits_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="operators_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="operators_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="utility" test-name="operators_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="operators_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="operators_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="operators_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="operators_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="operators_test" toolset="vc7" result="fail"/>
-    <test-result library="utility" test-name="operators_test" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="operator_tests_simple" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="operator_tests_simple" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="operator_tests_simple" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="operator_tests_simple" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="operator_tests_simple" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="utility" test-name="operators_test" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="operator_tests_simple" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="operator_tests_simple" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="operator_tests_simple" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="operator_tests_simple" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="operator_tests_simple" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="operator_tests_simple" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="operator_tests_simple" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="operator_tests_simple" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="operator_tests_simple" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="phoenix_control_structures" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="phoenix_control_structures" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="phoenix_control_structures" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="phoenix_control_structures" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="phoenix_control_structures" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="lambda" test-name="operator_tests_simple" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="phoenix_control_structures" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="phoenix_control_structures" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="phoenix_control_structures" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="phoenix_control_structures" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="phoenix_control_structures" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="phoenix_control_structures" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="phoenix_control_structures" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="phoenix_control_structures" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="phoenix_control_structures" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="projection_iterator_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="projection_iterator_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="projection_iterator_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="projection_iterator_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="projection_iterator_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="phoenix_control_structures" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="projection_iterator_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="projection_iterator_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="projection_iterator_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="projection_iterator_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="projection_iterator_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="projection_iterator_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="projection_iterator_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="projection_iterator_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="projection_iterator_example" toolset="vc7.1" result="success"/>
-    <test-result library="property_map" test-name="property_map_cc" toolset="cw-8.3" result="success"/>
-    <test-result library="property_map" test-name="property_map_cc" toolset="borland-5.5.1" result="success"/>
-    <test-result library="property_map" test-name="property_map_cc" toolset="borland-5.6.4" result="success"/>
-    <test-result library="property_map" test-name="property_map_cc" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="property_map" test-name="property_map_cc" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="projection_iterator_example" toolset="vc-7_1" result="success"/>
+    <test-result library="property_map" test-name="property_map_cc" toolset="cw-8_3" result="success"/>
+    <test-result library="property_map" test-name="property_map_cc" toolset="borland-5_5_1" result="success"/>
+    <test-result library="property_map" test-name="property_map_cc" toolset="borland-5_6_4" result="success"/>
+    <test-result library="property_map" test-name="property_map_cc" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="property_map" test-name="property_map_cc" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="property_map" test-name="property_map_cc" toolset="msvc" result="success"/>
     <test-result library="property_map" test-name="property_map_cc" toolset="msvc-stlport" result="success"/>
     <test-result library="property_map" test-name="property_map_cc" toolset="vc7" result="success"/>
-    <test-result library="property_map" test-name="property_map_cc" toolset="vc7.1" result="success"/>
-    <test-result library="random" test-name="random_demo" toolset="cw-8.3" result="fail"/>
-    <test-result library="random" test-name="random_demo" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="random" test-name="random_demo" toolset="borland-5.6.4" result="success"/>
-    <test-result library="random" test-name="random_demo" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="random" test-name="random_demo" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="property_map" test-name="property_map_cc" toolset="vc-7_1" result="success"/>
+    <test-result library="random" test-name="random_demo" toolset="cw-8_3" result="fail"/>
+    <test-result library="random" test-name="random_demo" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="random" test-name="random_demo" toolset="borland-5_6_4" result="success"/>
+    <test-result library="random" test-name="random_demo" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="random" test-name="random_demo" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="random" test-name="random_demo" toolset="msvc" result="fail"/>
     <test-result library="random" test-name="random_demo" toolset="msvc-stlport" result="fail"/>
     <test-result library="random" test-name="random_demo" toolset="vc7" result="fail"/>
-    <test-result library="random" test-name="random_demo" toolset="vc7.1" result="fail"/>
-    <test-result library="random" test-name="random_test" toolset="cw-8.3" result="fail"/>
-    <test-result library="random" test-name="random_test" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="random" test-name="random_test" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="random" test-name="random_test" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="random" test-name="random_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="random" test-name="random_demo" toolset="vc-7_1" result="fail"/>
+    <test-result library="random" test-name="random_test" toolset="cw-8_3" result="fail"/>
+    <test-result library="random" test-name="random_test" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="random" test-name="random_test" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="random" test-name="random_test" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="random" test-name="random_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="random" test-name="random_test" toolset="msvc" result="fail"/>
     <test-result library="random" test-name="random_test" toolset="msvc-stlport" result="fail"/>
     <test-result library="random" test-name="random_test" toolset="vc7" result="success"/>
-    <test-result library="random" test-name="random_test" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="range1" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="range1" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="range1" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="range1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="range1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="random" test-name="random_test" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="range1" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="range1" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="range1" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="range1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="range1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="range1" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="range1" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="range1" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="range1" toolset="vc7.1" result="success"/>
-    <test-result library="rational" test-name="rational_example" toolset="cw-8.3" result="success"/>
-    <test-result library="rational" test-name="rational_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="rational" test-name="rational_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="rational" test-name="rational_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="rational" test-name="rational_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="range1" toolset="vc-7_1" result="success"/>
+    <test-result library="rational" test-name="rational_example" toolset="cw-8_3" result="success"/>
+    <test-result library="rational" test-name="rational_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="rational" test-name="rational_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="rational" test-name="rational_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="rational" test-name="rational_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="rational" test-name="rational_example" toolset="msvc" result="success"/>
     <test-result library="rational" test-name="rational_example" toolset="msvc-stlport" result="success"/>
     <test-result library="rational" test-name="rational_example" toolset="vc7" result="success"/>
-    <test-result library="rational" test-name="rational_example" toolset="vc7.1" result="success"/>
-    <test-result library="rational" test-name="rational_test" toolset="cw-8.3" result="success"/>
-    <test-result library="rational" test-name="rational_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="rational" test-name="rational_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="rational" test-name="rational_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="rational" test-name="rational_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="rational" test-name="rational_example" toolset="vc-7_1" result="success"/>
+    <test-result library="rational" test-name="rational_test" toolset="cw-8_3" result="success"/>
+    <test-result library="rational" test-name="rational_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="rational" test-name="rational_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="rational" test-name="rational_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="rational" test-name="rational_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="rational" test-name="rational_test" toolset="msvc" result="success"/>
     <test-result library="rational" test-name="rational_test" toolset="msvc-stlport" result="success"/>
     <test-result library="rational" test-name="rational_test" toolset="vc7" result="success"/>
-    <test-result library="rational" test-name="rational_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="ref_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="ref_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="ref_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="ref_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="ref_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="rational" test-name="rational_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="ref_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="ref_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="ref_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="ref_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="ref_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="ref_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="ref_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="ref_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="ref_test" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="repetition" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="repetition" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="repetition" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="repetition" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="repetition" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="ref_test" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="repetition" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="repetition" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="repetition" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="repetition" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="repetition" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="repetition" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="repetition" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="repetition" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="repetition" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="reshape" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="reshape" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="reshape" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="reshape" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="reshape" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="repetition" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="reshape" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="reshape" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="reshape" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="reshape" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="reshape" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="reshape" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="reshape" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="reshape" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="reshape" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="reverse_iterator_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="reverse_iterator_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="reverse_iterator_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="reverse_iterator_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="reverse_iterator_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="reshape" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="reverse_iterator_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="reverse_iterator_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="reverse_iterator_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="reverse_iterator_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="reverse_iterator_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="reverse_iterator_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="reverse_iterator_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="reverse_iterator_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="reverse_iterator_example" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="selection" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="selection" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="selection" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="selection" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="selection" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="reverse_iterator_example" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="selection" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="selection" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="selection" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="selection" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="selection" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="selection" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="selection" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="selection" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="selection" toolset="vc7.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_1" toolset="cw-8.3" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="selection" toolset="vc-7_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_1" toolset="cw-8_3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tokenizer" test-name="simple_example_1" toolset="vc7" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_1" toolset="vc7.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_2" toolset="cw-8.3" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_1" toolset="vc-7_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_2" toolset="cw-8_3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tokenizer" test-name="simple_example_2" toolset="vc7" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_2" toolset="vc7.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_3" toolset="cw-8.3" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_3" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_2" toolset="vc-7_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_3" toolset="cw-8_3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_3" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_3" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tokenizer" test-name="simple_example_3" toolset="vc7" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_3" toolset="vc7.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_4" toolset="cw-8.3" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_4" toolset="borland-5.5.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_4" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_3" toolset="vc-7_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_4" toolset="cw-8_3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_4" toolset="borland-5_5_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_4" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tokenizer" test-name="simple_example_4" toolset="vc7" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_4" toolset="vc7.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_5" toolset="cw-8.3" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_5" toolset="borland-5.5.1" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_5" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_5" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_5" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_4" toolset="vc-7_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_5" toolset="cw-8_3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_5" toolset="borland-5_5_1" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_5" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_5" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_5" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tokenizer" test-name="simple_example_5" toolset="vc7" result="success"/>
-    <test-result library="tokenizer" test-name="simple_example_5" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="slice" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="slice" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="slice" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="slice" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="slice" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="tokenizer" test-name="simple_example_5" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="slice" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="slice" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="slice" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="slice" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="slice" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="slice" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="slice" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="slice" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="slice" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="slot" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="slot" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="slot" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="slot" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="slot" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="slice" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="slot" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="slot" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="slot" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="slot" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="slot" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="slot" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="slot" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="slot" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="slot" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="stl_interaction" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="stl_interaction" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="stl_interaction" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="stl_interaction" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="stl_interaction" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="slot" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="stl_interaction" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="stl_interaction" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="stl_interaction" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="stl_interaction" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="stl_interaction" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="stl_interaction" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="stl_interaction" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="stl_interaction" toolset="vc7" result="fail"/>
-    <test-result library="multi_array" test-name="stl_interaction" toolset="vc7.1" result="success"/>
-    <test-result library="multi_array" test-name="storage_order" toolset="cw-8.3" result="success"/>
-    <test-result library="multi_array" test-name="storage_order" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="multi_array" test-name="storage_order" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="multi_array" test-name="storage_order" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="multi_array" test-name="storage_order" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="multi_array" test-name="stl_interaction" toolset="vc-7_1" result="success"/>
+    <test-result library="multi_array" test-name="storage_order" toolset="cw-8_3" result="success"/>
+    <test-result library="multi_array" test-name="storage_order" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="multi_array" test-name="storage_order" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="multi_array" test-name="storage_order" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="multi_array" test-name="storage_order" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="multi_array" test-name="storage_order" toolset="msvc" result="success"/>
     <test-result library="multi_array" test-name="storage_order" toolset="msvc-stlport" result="success"/>
     <test-result library="multi_array" test-name="storage_order" toolset="vc7" result="success"/>
-    <test-result library="multi_array" test-name="storage_order" toolset="vc7.1" result="success"/>
-    <test-result library="lambda" test-name="switch_construct" toolset="cw-8.3" result="success"/>
-    <test-result library="lambda" test-name="switch_construct" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="lambda" test-name="switch_construct" toolset="borland-5.6.4" result="fail"/>
-    <test-result library="lambda" test-name="switch_construct" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="lambda" test-name="switch_construct" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="multi_array" test-name="storage_order" toolset="vc-7_1" result="success"/>
+    <test-result library="lambda" test-name="switch_construct" toolset="cw-8_3" result="success"/>
+    <test-result library="lambda" test-name="switch_construct" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="lambda" test-name="switch_construct" toolset="borland-5_6_4" result="fail"/>
+    <test-result library="lambda" test-name="switch_construct" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="lambda" test-name="switch_construct" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="lambda" test-name="switch_construct" toolset="msvc" result="fail"/>
     <test-result library="lambda" test-name="switch_construct" toolset="msvc-stlport" result="fail"/>
     <test-result library="lambda" test-name="switch_construct" toolset="vc7" result="fail"/>
-    <test-result library="lambda" test-name="switch_construct" toolset="vc7.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test1" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/ublas" test-name="test1" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test1" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="test1" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="numeric/ublas" test-name="test1" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="lambda" test-name="switch_construct" toolset="vc-7_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test1" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test1" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test1" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="test1" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="numeric/ublas" test-name="test1" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="numeric/ublas" test-name="test1" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="test1" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="test1" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="test1" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test2" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/ublas" test-name="test2" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test2" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="test2" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="numeric/ublas" test-name="test2" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test1" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test2" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test2" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test2" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="test2" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="numeric/ublas" test-name="test2" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="numeric/ublas" test-name="test2" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="test2" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="test2" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="test2" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test3" toolset="cw-8.3" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test3" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test3" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="test3" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test3" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test2" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test3" toolset="cw-8_3" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test3" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test3" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="test3" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test3" toolset="iw-7_1-vc6-stlp-4_5_3" result="fail"/>
     <test-result library="numeric/ublas" test-name="test3" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="test3" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="test3" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="test3" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test4" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/ublas" test-name="test4" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test4" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="test4" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="numeric/ublas" test-name="test4" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test3" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test4" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test4" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test4" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="test4" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="numeric/ublas" test-name="test4" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="numeric/ublas" test-name="test4" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="test4" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="test4" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="test4" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test5" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/ublas" test-name="test5" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test5" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="test5" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="numeric/ublas" test-name="test5" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test4" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test5" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test5" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test5" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="test5" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="numeric/ublas" test-name="test5" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="numeric/ublas" test-name="test5" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="test5" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="test5" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="test5" toolset="vc7.1" result="fail"/>
-    <test-result library="numeric/ublas" test-name="test6" toolset="cw-8.3" result="success"/>
-    <test-result library="numeric/ublas" test-name="test6" toolset="borland-5.5.1" result="success"/>
-    <test-result library="numeric/ublas" test-name="test6" toolset="borland-5.6.4" result="success"/>
-    <test-result library="numeric/ublas" test-name="test6" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="numeric/ublas" test-name="test6" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test5" toolset="vc-7_1" result="fail"/>
+    <test-result library="numeric/ublas" test-name="test6" toolset="cw-8_3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test6" toolset="borland-5_5_1" result="success"/>
+    <test-result library="numeric/ublas" test-name="test6" toolset="borland-5_6_4" result="success"/>
+    <test-result library="numeric/ublas" test-name="test6" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="numeric/ublas" test-name="test6" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="numeric/ublas" test-name="test6" toolset="msvc" result="success"/>
     <test-result library="numeric/ublas" test-name="test6" toolset="msvc-stlport" result="fail"/>
     <test-result library="numeric/ublas" test-name="test6" toolset="vc7" result="success"/>
-    <test-result library="numeric/ublas" test-name="test6" toolset="vc7.1" result="fail"/>
-    <test-result library="pool" test-name="test_pool_alloc" toolset="cw-8.3" result="success"/>
-    <test-result library="pool" test-name="test_pool_alloc" toolset="borland-5.5.1" result="success"/>
-    <test-result library="pool" test-name="test_pool_alloc" toolset="borland-5.6.4" result="success"/>
-    <test-result library="pool" test-name="test_pool_alloc" toolset="intel-win32-7.1-vc6" result="fail"/>
-    <test-result library="pool" test-name="test_pool_alloc" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="numeric/ublas" test-name="test6" toolset="vc-7_1" result="fail"/>
+    <test-result library="pool" test-name="test_pool_alloc" toolset="cw-8_3" result="success"/>
+    <test-result library="pool" test-name="test_pool_alloc" toolset="borland-5_5_1" result="success"/>
+    <test-result library="pool" test-name="test_pool_alloc" toolset="borland-5_6_4" result="success"/>
+    <test-result library="pool" test-name="test_pool_alloc" toolset="iw-7_1-vc6" result="fail"/>
+    <test-result library="pool" test-name="test_pool_alloc" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="pool" test-name="test_pool_alloc" toolset="msvc" result="fail"/>
     <test-result library="pool" test-name="test_pool_alloc" toolset="msvc-stlport" result="fail"/>
     <test-result library="pool" test-name="test_pool_alloc" toolset="vc7" result="fail"/>
-    <test-result library="pool" test-name="test_pool_alloc" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="tie_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="tie_example" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="utility" test-name="tie_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="tie_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="tie_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="pool" test-name="test_pool_alloc" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="tie_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="tie_example" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="utility" test-name="tie_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="tie_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="tie_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="tie_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="tie_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="tie_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="tie_example" toolset="vc7.1" result="success"/>
-    <test-result library="timer" test-name="timer_test" toolset="cw-8.3" result="success"/>
-    <test-result library="timer" test-name="timer_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="timer" test-name="timer_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="timer" test-name="timer_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="timer" test-name="timer_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="tie_example" toolset="vc-7_1" result="success"/>
+    <test-result library="timer" test-name="timer_test" toolset="cw-8_3" result="success"/>
+    <test-result library="timer" test-name="timer_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="timer" test-name="timer_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="timer" test-name="timer_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="timer" test-name="timer_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="timer" test-name="timer_test" toolset="msvc" result="success"/>
     <test-result library="timer" test-name="timer_test" toolset="msvc-stlport" result="success"/>
     <test-result library="timer" test-name="timer_test" toolset="vc7" result="success"/>
-    <test-result library="timer" test-name="timer_test" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_example" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_example" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_example" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_example" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_example" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="timer" test-name="timer_test" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_example" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_example" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_example" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_example" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_example" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="transform_iterator_example" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="transform_iterator_example" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="transform_iterator_example" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_example" toolset="vc7.1" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_test" toolset="cw-8.3" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_test" toolset="borland-5.5.1" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_test" toolset="borland-5.6.4" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_test" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_test" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_example" toolset="vc-7_1" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_test" toolset="cw-8_3" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_test" toolset="borland-5_5_1" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_test" toolset="borland-5_6_4" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_test" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_test" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="utility" test-name="transform_iterator_test" toolset="msvc" result="success"/>
     <test-result library="utility" test-name="transform_iterator_test" toolset="msvc-stlport" result="success"/>
     <test-result library="utility" test-name="transform_iterator_test" toolset="vc7" result="success"/>
-    <test-result library="utility" test-name="transform_iterator_test" toolset="vc7.1" result="success"/>
-    <test-result library="preprocessor" test-name="tuple" toolset="cw-8.3" result="success"/>
-    <test-result library="preprocessor" test-name="tuple" toolset="borland-5.5.1" result="success"/>
-    <test-result library="preprocessor" test-name="tuple" toolset="borland-5.6.4" result="success"/>
-    <test-result library="preprocessor" test-name="tuple" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="preprocessor" test-name="tuple" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="utility" test-name="transform_iterator_test" toolset="vc-7_1" result="success"/>
+    <test-result library="preprocessor" test-name="tuple" toolset="cw-8_3" result="success"/>
+    <test-result library="preprocessor" test-name="tuple" toolset="borland-5_5_1" result="success"/>
+    <test-result library="preprocessor" test-name="tuple" toolset="borland-5_6_4" result="success"/>
+    <test-result library="preprocessor" test-name="tuple" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="preprocessor" test-name="tuple" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="preprocessor" test-name="tuple" toolset="msvc" result="success"/>
     <test-result library="preprocessor" test-name="tuple" toolset="msvc-stlport" result="fail"/>
     <test-result library="preprocessor" test-name="tuple" toolset="vc7" result="success"/>
-    <test-result library="preprocessor" test-name="tuple" toolset="vc7.1" result="success"/>
-    <test-result library="tuple" test-name="tuple_test_bench" toolset="cw-8.3" result="success"/>
-    <test-result library="tuple" test-name="tuple_test_bench" toolset="borland-5.5.1" result="fail"/>
-    <test-result library="tuple" test-name="tuple_test_bench" toolset="borland-5.6.4" result="success"/>
-    <test-result library="tuple" test-name="tuple_test_bench" toolset="intel-win32-7.1-vc6" result="success"/>
-    <test-result library="tuple" test-name="tuple_test_bench" toolset="intel-win32-7.1-vc6-stlport-4.5.3" result="success"/>
+    <test-result library="preprocessor" test-name="tuple" toolset="vc-7_1" result="success"/>
+    <test-result library="tuple" test-name="tuple_test_bench" toolset="cw-8_3" result="success"/>
+    <test-result library="tuple" test-name="tuple_test_bench" toolset="borland-5_5_1" result="fail"/>
+    <test-result library="tuple" test-name="tuple_test_bench" toolset="borland-5_6_4" result="success"/>
+    <test-result library="tuple" test-name="tuple_test_bench" toolset="iw-7_1-vc6" result="success"/>
+    <test-result library="tuple" test-name="tuple_test_bench" toolset="iw-7_1-vc6-stlp-4_5_3" result="success"/>
     <test-result library="tuple" test-name="tuple_test_bench" toolset="msvc" result="success"/>
     <test-result library="tuple" test-name="tuple_test_bench" toolset="msvc-stlport" result="fail"/>
     <test-result library="tuple" test-name="tuple_test_bench" toolset="vc7" result="success"/>
-    <test-result library="tuple" test-name="tuple_test_bench" toolset="vc7.1" result="success"/>
+    <test-result library="tuple" test-name="tuple_test_bench" toolset="vc-7_1" result="success"/>
     <test-result library="io" test-name="ios_state_test" toolset="intel-7.1-stdlib-native-linux" result="success"/>
     <test-result library="io" test-name="ios_state_test" toolset="gcc-3.4.0-linux" result="success"/>
     <test-result library="io" test-name="ios_state_test" toolset="intel-7.1-linux" result="success"/>

+ 7 - 7
more/getting_started.html

@@ -445,7 +445,7 @@
 
       <td>Microsoft <a href="http://msdn.microsoft.com/visualc/">Visual
       C++</a> version 6 command-line tools. NOTE; For version 7.x (the .NET
-      series) use the vc7 or vc7.1 toolsets below.</td>
+      series) use the vc7 or vc-7_1 toolsets below.</td>
     </tr>
 
     <tr>
@@ -456,7 +456,7 @@
       C++</a> version 6 command-line tools, using the <a href=
       "http://www.stlport.org">STLport</a> standard library implementation.
       NOTE; For version 7.x (the .NET series) use the vc7-stlport or
-      vc7.1-stlport toolsets below.</td>
+      vc-7_1-stlport toolsets below.</td>
     </tr>
 
     <tr>
@@ -510,7 +510,7 @@
 
     <tr>
       <td><a href=
-      "../tools/build/v1/vc7.1-tools.html"><code>vc7.1</code></a></td>
+      "../tools/build/v1/vc-7_1-tools.html"><code>vc-7_1</code></a></td>
 
       <td>Microsoft <a href="http://msdn.microsoft.com/visualc/">Visual
       C++</a> command-line tools from Visual Studio .NET 2003.</td>
@@ -518,7 +518,7 @@
 
     <tr>
       <td><a href=
-      "../tools/build/v1/vc7.1-stlport-tools.html"><code>vc7.1-stlport</code></a></td>
+      "../tools/build/v1/vc-7_1-stlport-tools.html"><code>vc-7_1-stlport</code></a></td>
 
       <td>Microsoft <a href="http://msdn.microsoft.com/visualc/">Visual
       C++</a> command-line tools from Visual Studio .NET 2003 + STLPort.</td>
@@ -926,7 +926,7 @@
   building with. The abbreviation is composed of a short, 2 to 4 characters,
   tag for the compiler and a version number of the compiler's major and minor
   revision (if available). For example if your toolset is
-  "<tt>gcc-3.2.3</tt>" the toolset tag would be "<tt>gcc32</tt>". The toolset
+  "<tt>gcc-3_2_3</tt>" the toolset tag would be "<tt>gcc32</tt>". The toolset
   abbreviations used are as follows:</p>
 
   <table border="1" cellpadding="5" summary="">
@@ -1119,14 +1119,14 @@
 
     <tr>
       <td><a href=
-      "../tools/build/v1/vc7.1-tools.html"><code>vc7.1</code></a></td>
+      "../tools/build/v1/vc-7_1-tools.html"><code>vc-7_1</code></a></td>
 
       <td><tt>vc</tt></td>
     </tr>
 
     <tr>
       <td><a href=
-      "../tools/build/v1/vc7.1-stlport-tools.html"><code>vc7.1-stlport</code></a></td>
+      "../tools/build/v1/vc-7_1-stlport-tools.html"><code>vc-7_1-stlport</code></a></td>
 
       <td><tt>vc</tt></td>
     </tr>

+ 134 - 134
status/explicit-failures-markup.xml

@@ -16,19 +16,19 @@
     -->
 
     <!-- /////////////// Toolsets /////////////// -->
-    <mark-toolset name="borland-5.6.4" status="required"/>
-    <mark-toolset name="cw-9.3" status="required"/>
-    <mark-toolset name="cw-8.3" status="required"/>
+    <mark-toolset name="borland-5_6_4" status="required"/>
+    <mark-toolset name="cw-9_3" status="required"/>
+    <mark-toolset name="cw-8_3" status="required"/>
     <mark-toolset name="msvc" status="required"/>
     <mark-toolset name="msvc-stlport" status="required"/>
     <mark-toolset name="vc7" status="required"/>
-    <mark-toolset name="vc7.1" status="required"/>
-    <mark-toolset name="vc8.0" status="required"/>
-    <mark-toolset name="mingw-3.4.2" status="required"/>
-    <mark-toolset name="mingw-3.3.1" status="required"/>
-    <mark-toolset name="intel-win32-7.1-vc6" status="required"/>
-    <mark-toolset name="intel-win32-7.1-vc6-stlport-4.5.3" status="required"/>
-    <mark-toolset name="intel-win32-8.0" status="required"/>
+    <mark-toolset name="vc-7_1" status="required"/>
+    <mark-toolset name="vc-8_0" status="required"/>
+    <mark-toolset name="mingw-3_4_2" status="required"/>
+    <mark-toolset name="mingw-3_3_1" status="required"/>
+    <mark-toolset name="iw-7_1-vc6" status="required"/>
+    <mark-toolset name="iw-7_1-vc6-stlp-4_5_3" status="required"/>
+    <mark-toolset name="intel-win32-8_0" status="required"/>
     <mark-toolset name="gcc-2.95.3-linux" status="required"/>
     <mark-toolset name="gcc-2.95.3-stlport-4.5.3-linux" status="required"/>
     <mark-toolset name="gcc-3.3.3-linux" status="required"/>
@@ -42,10 +42,10 @@
     <library name="algorithm/string">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
-            <toolset name="intel-win32-7.1-vc6"/>
+            <toolset name="iw-7_1-vc6"/>
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
             <toolset name="mipspro"/>
@@ -58,7 +58,7 @@
         <test name="array3">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note refid="3"/>
@@ -67,7 +67,7 @@
         <test name="array4">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note refid="3"/>
@@ -98,7 +98,7 @@
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="list_of"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
             <toolset name="vc7"/>
@@ -109,7 +109,7 @@
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="multi_index_container"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3*"/>
             <toolset name="intel-8.0-linux"/>
             <toolset name="gcc-3.4.1*"/>
@@ -151,7 +151,7 @@
     <library name="concept_check">
         <test name="class_concept_fail_expected">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
         </test>
@@ -167,20 +167,20 @@
         </test>
         <test name="config_link_test">
             <mark-failure>
-                <toolset name="*como-win32-4.3.3-vc7*"/>
+                <toolset name="*como-4_3_3-vc7*"/>
                 <note author="J. Maddock" refid="3"/>
             </mark-failure>
         </test>
         <test name="limits_test">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
         </test>
 
         <test name="limits_test">
             <mark-failure>
-                <toolset name="intel-win32-7.1-vc6-stlport-4.5.3"/>
+                <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
                 <note author="Aleksey Gurtovoy" refid="4"/>
             </mark-failure>
         </test>
@@ -191,7 +191,7 @@
     <library name="conversion">
         <test name="lexical_cast_test">
             <mark-failure>
-                <toolset name="vc8.0"/>
+                <toolset name="vc-8_0"/>
                 <note author="Aleksey Gurtovoy" refid="4"/>
             </mark-failure>
         </test>
@@ -202,8 +202,8 @@
     <library name="date_time">
         <mark-unusable>
             <toolset name="msvc-stlport"/>
-            <toolset name="intel-win32-7.1-vc6-stlport-4.5.3"/>
-            <toolset name="intel-win32-7.1-vc6"/>
+            <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
+            <toolset name="iw-7_1-vc6"/>
         </mark-unusable>
 
         <test name="testdate_iterator">
@@ -237,13 +237,13 @@
             <mark-failure>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
-                <toolset name="cw-8.3*"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="cw-8_3*"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="mingw-3*"/>
                 <toolset name="gcc"/>
                 <toolset name="gcc-2.95.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="B. Garst" refid="19,21"/>
             </mark-failure>
         </test>
@@ -254,9 +254,9 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="mingw-3*"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="B. Garst" refid="19,21,22"/>
             </mark-failure>
         </test>
@@ -267,9 +267,9 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="mingw-3*"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="B. Garst" refid="19,21,22"/>
             </mark-failure>
         </test>
@@ -289,11 +289,11 @@
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
                 <toolset name="mingw-3*"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="B. Garst" refid="18,19"/>
             </mark-failure>
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="R. Rivera" refid="25"/>
             </mark-failure>
         </test>
@@ -304,7 +304,7 @@
         </test>
         <test name="testgreg_year_dll">
             <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
             </mark-failure>
         </test>
@@ -319,7 +319,7 @@
         <test name="testmicrosec_time_clock">
             <mark-failure>
             <toolset name="intel-7.1-stdlib-default-linux"/>
-            <toolset name="*como-win32-4.3.3*"/>
+            <toolset name="*como-4_3_3*"/>
             <toolset name="intel-7.1-linux"/>
                 <note author="B. Garst" refid="22"/>
             </mark-failure>
@@ -331,31 +331,31 @@
                 <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
                 <toolset name="gcc-3.1-darwin"/>
                 <toolset name="msvc"/>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <toolset name="vc7"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="mingw-3*"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="B. Garst" refid="18,19,20"/>
             </mark-failure>
         </test>
         <test name="testdate_dll">
             <mark-failure>
                 <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="J. Garland" date="30 Jan 2004" id="24"/>
             </mark-failure>
         </test>
         <test name="testgreg_day_dll">
             <mark-failure>
                 <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="J. Garland" date="30 Jan 2004" id="24"/>
             </mark-failure>
         </test>
         <test name="*_dll">
             <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="J. Garland" date="30 Jan 2004" id="24"/>
             </mark-failure>
         </test>
@@ -372,7 +372,7 @@
     <library name="dynamic_bitset">
         <test name="dyn_bitset_unit_tests4">
             <mark-failure>
-                <toolset name="cw-9.3"/>
+                <toolset name="cw-9_3"/>
                 <toolset name="intel-8.0-linux"/>
                 <note author="Aleksey Gurtovoy" refid="2"/>
             </mark-failure>
@@ -392,7 +392,7 @@
         </mark-unusable>
         <test name="operations_test">
             <mark-failure>
-                <toolset name="vc8.0"/>
+                <toolset name="vc-8_0"/>
                 <note author="Aleksey Gurtovoy" refid="4"/>
             </mark-failure>
         </test>
@@ -402,7 +402,7 @@
     <!-- graph -->
     <library name="graph">
         <mark-unusable>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
         </mark-unusable>
@@ -420,7 +420,7 @@
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="betweenness_centrality_test"/>
-            <toolset name="intel-win32-7.1-vc6*"/>
+            <toolset name="iw-7_1-vc6*"/>
             <toolset name="vc7"/>
             <note refid="3" author="Aleksey Gurtovoy"/>
         </mark-expected-failures>
@@ -431,8 +431,8 @@
     <library name="io">
         <mark-expected-failures>
             <test name="ios_state_unit_test"/>
-            <toolset name="borland-5.6.4"/>
-            <toolset name="intel-win32-7.1-v6*"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="iw-7_1-vc6*"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
             <note refid="4" author="Aleksey Gurtovoy"/>
@@ -446,8 +446,8 @@
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
-            <toolset name="borland-5.5.1"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="borland-5_5_1"/>
             <toolset name="vc7"/>
             <note refid="17">
             </note>
@@ -475,7 +475,7 @@
             <test name="has_xxx"/>
             <test name="no_has_xxx"/>
             <test name="single_view"/>
-            <toolset name="cw-8.3*"/>
+            <toolset name="cw-8_3*"/>
             <note author="Aleksey Gurtovoy" date="17 Sep 2004">
                 This failure is caused by a deficient SFINAE implementation; the bug
                 was fixed in the next major compiler version (CodeWarrior 9.x).
@@ -485,7 +485,7 @@
         <mark-expected-failures>
             <test name="is_sequence"/>
             <test name="as_sequence"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="gcc-2.95.3*"/>
             <note author="Aleksey Gurtovoy" date="17 Sep 2004">
                 This failure is caused by a deficient SFINAE implementation.
@@ -498,7 +498,7 @@
             <test name="multiset"/>
             <test name="zip_view"/>
 
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="Aleksey Gurtovoy" date="17 Sep 2004" refid="26"/>
         </mark-expected-failures>
 
@@ -518,7 +518,7 @@
 
         <mark-expected-failures>
             <test name="quote"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc*"/>
             <toolset name="mipspro"/>
             <note author="Aleksey Gurtovoy" date="17 Sep 2004">
@@ -530,7 +530,7 @@
         <mark-expected-failures>
             <test name="map"/>
             <test name="set"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc*"/>
             <toolset name="vc7"/>
             <toolset name="gcc-2.95.3*"/>
@@ -548,8 +548,8 @@
     <library name="multi_array">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
-            <toolset name="borland-5.5.1"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="borland-5_5_1"/>
             <note author="Alisdair Meredith" date="30 Jan 2004">
                 <p>
                 This library has never worked [on Borland 5.5.1 and 5.6.4], and the only tests that 'pass' are
@@ -579,7 +579,7 @@ for more information.
     <!-- multi_index -->
     <library name="multi_index">
         <mark-unusable>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="J. L&#243;pez" date="05 Jul 2004" refid="17"/>
         </mark-unusable>
         <mark-unusable>
@@ -588,7 +588,7 @@ for more information.
             <note author="J. L&#243;pez" date="09 Jul 2004" refid="17"/>
         </mark-unusable>
         <mark-unusable>
-            <toolset name="meta-como-win32-4.3.3-msvc"/>
+            <toolset name="*como-4_3_3-msvc"/>
             <note author="J. L&#243;pez" date="30 Jul 2004">
                 The VC++ 6.0 backend runs out of internal resources while
                 trying to process the Comeau output for this library;
@@ -611,17 +611,17 @@ for more information.
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="optional_test_ref_fail1"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="Fernando Cacciola" refid="2"/>
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="optional_test_fail3a"/>
-            <toolset name="gcc-3.3-darwin"/>
+            <toolset name="gcc-3_3-darwin"/>
             <note author="Fernando Cacciola" refid="2"/>
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="optional_test_inplace_fail2"/>
-            <toolset name="gcc-3.3-darwin"/>
+            <toolset name="gcc-3_3-darwin"/>
             <note author="Fernando Cacciola" refid="2"/>
         </mark-expected-failures>
     </library>
@@ -654,7 +654,7 @@ for more information.
                 <note author="Robert Ramey" date="20 Sep 2004" refid="19"/>
             </mark-failure>
             <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="Robert Ramey" date="20 Sep 2004" refid="5"/>
             </mark-failure>
         </test>
@@ -672,7 +672,7 @@ for more information.
         </test>
         <mark-expected-failures>
             <test name="*"/>
-            <toolset name="vc8.0"/>
+            <toolset name="vc-8_0"/>
             <note author="Aleksey Gurtovoy">
                 This failure is caused by a compiler bug in version 14.00.40809 that has
                 been fixed in the latest development "alpha".
@@ -752,8 +752,8 @@ for more information.
         <mark-unusable>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
-            <toolset name="borland-5.5.1"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_5_1"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="vc7"/>
             <toolset name="gcc-2.95.3-linux"/>
             <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
@@ -789,7 +789,7 @@ for more information.
         </mark-unusable>
         <mark-expected-failures>
             <test name="action_tests*"/>
-            <toolset name="intel-win32-7.1-vc6"/>
+            <toolset name="iw-7_1-vc6"/>
             <note author="Aleksey Gurtovoy" refid="4"/>
         </mark-expected-failures>
         <mark-expected-failures>
@@ -808,7 +808,7 @@ for more information.
             <test name="bug_fixes*"/>
             <test name="chset_tests*"/>
             <test name="epsilon_tests*"/>
-            <toolset name="vc8.0"/>
+            <toolset name="vc-8_0"/>
             <note author="Aleksey Gurtovoy">
                 This failure is caused by a compiler bug in version 14.00.40809 that has
                 been fixed in the latest development "alpha".
@@ -842,7 +842,7 @@ for more information.
         <test name="function_arith_cxx98">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
@@ -851,7 +851,7 @@ for more information.
         <test name="function_ref_cxx98">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
@@ -860,46 +860,46 @@ for more information.
         <test name="lambda_test">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="2"/>
             </mark-failure>
         </test>
         <test name="lib_function_test">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="2"/>
             </mark-failure>
         </test>
         <test name="mem_fun_cxx98">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="2"/>
             </mark-failure>
         </test>
         <test name="std_bind_cxx98">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
@@ -914,7 +914,7 @@ for more information.
         <test name="sum_avg_cxx98">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
@@ -928,7 +928,7 @@ for more information.
         <test name="interoperable_fail">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="2"/>
@@ -953,7 +953,7 @@ for more information.
         <test name="is_convertible_fail" corner-case="yes">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note refid="2"/>
@@ -979,7 +979,7 @@ for more information.
             <test name="indirect_iter_member_types"/>
             <test name="pointee"/>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="D. Abrahams">
                 This failure is caused by a compiler bug.  The
                 compiler tends to drop const-ness and as a result
@@ -992,7 +992,7 @@ for more information.
         <mark-expected-failures>
             <test name="zip_iterator_test"/>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="Aleksey Gurtovoy" date="19 Sep 2004" refid="26"/>
         </mark-expected-failures>
 
@@ -1014,7 +1014,7 @@ for more information.
     <library name="numeric/conversion">
         <mark-unusable>
             <toolset name="gcc-2.95.3-linux"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="Aleksey Gurtovoy" refid="5"/>
         </mark-unusable>
         <mark-expected-failures>
@@ -1045,16 +1045,16 @@ for more information.
     <library name="numeric/interval">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
             <toolset name="vc7"/>
         </mark-unusable>
         <test name="test_float">
             <mark-failure>
-                <toolset name="borland-5.5.1"/>
-                <toolset name="intel-win32-7.1-vc6"/>
-                <toolset name="intel-win32-7.1-vc6-stlport-4.5.3"/>
+                <toolset name="borland-5_5_1"/>
+                <toolset name="iw-7_1-vc6"/>
+                <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
                 <note author="G. Melquiond">
                     This test ensures the inclusion property of interval
                     arithmetic is available for built-in floating-point types
@@ -1076,7 +1076,7 @@ for more information.
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="det"/>
-            <toolset name="cw-8.3*"/>
+            <toolset name="cw-8_3*"/>
             <note author="Aleksey Gurtovoy" refid="2"/>
         </mark-expected-failures>
     </library>
@@ -1086,7 +1086,7 @@ for more information.
     <library name="numeric/ublas">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_6_4"/>
             <note author="M.Stevens" refid="2"/>
         </mark-unusable>
         <test name="test2">
@@ -1097,25 +1097,25 @@ for more information.
         </test>
         <test name="test3">
             <mark-failure>
-                <toolset name="intel-win32-8.1"/>
+                <toolset name="intel-win32-8_1"/>
                 <note author="S. Slapeta" refid="3"/>
             </mark-failure>
         </test>
         <test name="test4">
             <mark-failure>
-                <toolset name="intel-win32-8.1"/>
+                <toolset name="intel-win32-8_1"/>
                 <note author="S. Slapeta" refid="3"/>
             </mark-failure>
         </test>
         <test name="test5">
             <mark-failure>
-                <toolset name="intel-win32-8.1"/>
+                <toolset name="intel-win32-8_1"/>
                 <note author="S. Slapeta" refid="3"/>
             </mark-failure>
         </test>
         <test name="test6">
             <mark-failure>
-                <toolset name="intel-win32-8.1"/>
+                <toolset name="intel-win32-8_1"/>
                 <note author="S. Slapeta" refid="3"/>
             </mark-failure>
         </test>
@@ -1143,8 +1143,8 @@ for more information.
 
         <test name="unicode_test*">
             <mark-failure>
-                <toolset name="intel-win32-7.1-vc6"/>
-                <toolset name="intel-win32-7.1-vc6-stlport-4.5.3"/>
+                <toolset name="iw-7_1-vc6"/>
+                <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
                 <toolset name="msvc"/>
                 <toolset name="msvc-stlport"/>
                 <toolset name="vc7"/>
@@ -1155,7 +1155,7 @@ for more information.
 
         <test name="unicode_test">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note>The test fails at runtime for unknown reason</note>
             </mark-failure>
         </test>
@@ -1164,28 +1164,28 @@ for more information.
         <test name="options_description_test_dll">
              <mark-failure>
                 <toolset name="msvc"/>
-                <toolset name="intel-win32-7.1-vc6"/>
+                <toolset name="iw-7_1-vc6"/>
                 <note refid="23"/>
             </mark-failure>
         </test>
 
         <test name="variable_map_test_dll">
              <mark-failure>
-                <toolset name="intel-win32-7.1-vc6"/>
+                <toolset name="iw-7_1-vc6"/>
                 <note refid="23"/>
             </mark-failure>
         </test>
 
         <test name="*dll">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note refid="18"/>
             </mark-failure>
         </test>
 
         <test name="*dll">
              <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note refid="24"/>
             </mark-failure>
         </test>
@@ -1209,8 +1209,8 @@ for more information.
     <library name="python">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="borland-5.5.1"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="borland-5_5_1"/>
+            <toolset name="borland-5_6_4"/>
             <note refid="2"/>
             <note refid="17"/>
         </mark-unusable>
@@ -1258,18 +1258,18 @@ for more information.
         </mark-unusable>
         <test name="random*">
             <mark-failure>
-                <toolset name="intel-win32-8.0"/>
+                <toolset name="intel-win32-8_0"/>
                 <note author="S. Slapeta" refid="3"/>
             </mark-failure>
         </test>
         <test name="random_test">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <note author="B. Dawes" refid="2"/>
             </mark-failure>
         </test>
@@ -1284,8 +1284,8 @@ for more information.
         </mark-unusable>
         <mark-expected-failures>
             <test name="array_test"/>
-            <toolset name="como-win32-4.3.3*"/>
-            <toolset name="borland-5.6.4"/>
+            <toolset name="como-4_3_3*"/>
+            <toolset name="borland-5_6_4"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
             <toolset name="vc7"/>
@@ -1293,7 +1293,7 @@ for more information.
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="iterator_range"/>
-            <toolset name="cw-8.3*"/>
+            <toolset name="cw-8_3*"/>
             <toolset name="msvc-stlport"/>
             <toolset name="vc7"/>
             <toolset name="tru64cxx65"/>
@@ -1324,11 +1324,11 @@ for more information.
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="sub_range"/>
-            <toolset name="vc8.0"/>
-            <toolset name="intel-win32-7.1-vc6-stlport-4.5.3"/>
+            <toolset name="vc-8_0"/>
+            <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
             <toolset name="msvc-stlport"/>
             <toolset name="vc7"/>
-            <toolset name="cw-8.3*"/>
+            <toolset name="cw-8_3*"/>
             <toolset name="tru64cxx65"/>
             <note refid="6" author="Thorsten Ottosen">
                 For most compilers this is due to problems
@@ -1351,13 +1351,13 @@ for more information.
         </test>
         <test name="posix_api_check">
             <mark-failure>
-                <toolset name="como-win32-4.3.3-vc7*"/>
+                <toolset name="como-4_3_3-vc7*"/>
                 <note author="J. Maddock"/>
             </mark-failure>
         </test>
         <test name="*_dll">
             <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note author="J. Maddock"/>
             </mark-failure>
         </test>
@@ -1367,18 +1367,18 @@ for more information.
     <library name="signals">
         <test name="dead_slot_test">
             <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note refid="3" author="D. Gregor"/>
             </mark-failure>
         </test>
         <test name="signal_test">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="2"/>
             </mark-failure>
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="vc7"/>
                 <note author="B. Dawes" refid="3"/>
@@ -1386,7 +1386,7 @@ for more information.
         </test>
         <test name="trackable_test">
             <mark-failure>
-                <toolset name="*como-win32-4.3.3*"/>
+                <toolset name="*como-4_3_3*"/>
                 <note refid="3" author="D. Gregor"/>
             </mark-failure>
         </test>
@@ -1396,7 +1396,7 @@ for more information.
     <library name="static_assert">
         <test name="static_assert_test_fail_8">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <note author="B. Dawes" refid="3"/>
             </mark-failure>
         </test>
@@ -1412,7 +1412,7 @@ for more information.
 
         <mark-expected-failures>
             <test name="errors_handling_test"/>
-            <toolset name="*como-win32-4.3.3*"/>
+            <toolset name="*como-4_3_3*"/>
             <note author="B. Dawes" refid="3"/>
         </mark-expected-failures>
 
@@ -1422,7 +1422,7 @@ for more information.
     <!-- thread -->
     <library name="thread">
         <mark-unusable>
-            <toolset name="*como-win32-4.3.3*"/>
+            <toolset name="*como-4_3_3*"/>
             <note author="B. Dawes" refid="10"/>
         </mark-unusable>
         <test name="test_mutex">
@@ -1435,9 +1435,9 @@ for more information.
         <test name="test_tss_lib">
             <mark-failure>
                 <toolset name="mingw*"/>
-                <toolset name="borland-5.6.4"/>
-                <toolset name="cw-8.3*"/>
-                <toolset name="cw-9.3"/>
+                <toolset name="borland-5_6_4"/>
+                <toolset name="cw-8_3*"/>
+                <toolset name="cw-9_3"/>
                 <toolset name="vc7"/>
                 <note author="Aleksey Gurtovoy" date="19 Sep 2004">
                     This functionality has not been implemented yet. The library
@@ -1494,21 +1494,21 @@ for more information.
         </mark-expected-failures>
         <test name="tricky_incomplete_type_test">
             <mark-failure>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
             </mark-failure>
         </test>
         <test name="tricky_is_enum_test">
             <mark-failure>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="msvc"/>
                 <toolset name="msvc-stlport"/>
             </mark-failure>
         </test>
         <test name="is_abstract_test">
             <mark-failure>
-                <toolset name="borland-5.6.4"/>
-                <toolset name="cw-8.3*"/>
-                <toolset name="cw-9.3*"/>
+                <toolset name="borland-5_6_4"/>
+                <toolset name="cw-8_3*"/>
+                <toolset name="cw-9_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="msvc-stlport"/>
                 <toolset name="vc7"/>
@@ -1521,8 +1521,8 @@ for more information.
     <library name="utility/enable_if">
         <mark-unusable>
             <toolset name="borland"/>
-            <toolset name="borland-5.6.4"/>
-            <toolset name="cw-8.3*"/>
+            <toolset name="borland-5_6_4"/>
+            <toolset name="cw-8_3*"/>
             <toolset name="msvc"/>
             <toolset name="msvc-stlport"/>
             <toolset name="vc7"/>
@@ -1541,8 +1541,8 @@ for more information.
         </test>
         <test name="result_of_test">
             <mark-failure>
-                <toolset name="borland-5.6.4"/>
-                <toolset name="cw-8.3*"/>
+                <toolset name="borland-5_6_4"/>
+                <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="msvc-stlport"/>
                 <toolset name="vc7"/>
@@ -1561,7 +1561,7 @@ for more information.
         <test name="recursive_variant_test">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <toolset name="como-win32"/>
                 <toolset name="msvc"/>
                 <toolset name="msvc-stlport"/>
@@ -1572,13 +1572,13 @@ for more information.
         <test name="variant_test1">
             <mark-failure>
                 <toolset name="borland"/>
-                <toolset name="borland-5.6.4"/>
+                <toolset name="borland-5_6_4"/>
                 <note refid="2"/>
             </mark-failure>
         </test>
         <test name="variant_reference_test">
             <mark-failure>
-                <toolset name="cw-8.3*"/>
+                <toolset name="cw-8_3*"/>
                 <toolset name="msvc"/>
                 <toolset name="msvc-stlport"/>
                 <toolset name="vc7"/>
@@ -1586,7 +1586,7 @@ for more information.
             </mark-failure>
             <mark-failure>
                 <toolset name="intel-win32"/>
-                <toolset name="intel-win32-7.1*"/>
+                <toolset name="iw-7_1*"/>
                 <toolset name="intel-7.1*"/>
                 <note refid="2"/>
             </mark-failure>

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit b379061eb7addcac8b3040fa4b63ea457af90a95
+Subproject commit 438023f2c046a212c84e403a2577dd928235b5cf

粤ICP备19079148号