Browse Source

Merge from trunk.

[SVN r41865]
Daniel James 18 years ago
parent
commit
cd8d2171d6
4 changed files with 21 additions and 12 deletions
  1. 1 1
      libs/asio
  2. 1 1
      libs/thread
  3. 18 9
      status/explicit-failures-markup.xml
  4. 1 1
      tools/build

+ 1 - 1
libs/asio

@@ -1 +1 @@
-Subproject commit 78643f7103e26eb7325bb9eba530d8b41aa60922
+Subproject commit 8cf596dd58af7b784eec4e919e8c1fe56b8ffee2

+ 1 - 1
libs/thread

@@ -1 +1 @@
-Subproject commit d460417a09598b699e0b3825ec43ff612db1d84a
+Subproject commit 1b56fe63d1873fc477fde19f5831d06075cdf183

+ 18 - 9
status/explicit-failures-markup.xml

@@ -4395,16 +4395,28 @@ for more information.
             <toolset name="hp_cxx-71*"/>
             <note author="Andreas Huber" refid="29"/>
         </mark-expected-failures>
+        <mark-expected-failures reason="?">
+            <test name="TransitionTest*"/>
+            <toolset name="intel-linux*"/>
+            <toolset name="pathscale*"/>
+            <note author="Andreas Huber" refid="29"/>
+        </mark-expected-failures>
+        <mark-expected-failures reason="?">
+          <test name="TransitionTest*"/>
+          <test name="InvalidTransitionTest1Relaxed"/>
+          <test name="StopWatchExample"/>
+          <toolset name="vacpp-8.0"/>
+          <note author="Andreas Huber" refid="29"/>
+        </mark-expected-failures>
         <mark-expected-failures reason="?">
             <test name="CustomReactionTest*"/>
             <toolset name="acc*"/>
             <note author="Andreas Huber" refid="29"/>
         </mark-expected-failures>
         <mark-expected-failures reason="?">
-            <test name="TransitionTest*"/>
-            <test name="PerformanceExample"/>
-            <toolset name="vacpp"/>
-            <note author="Andreas Huber" refid="29"/>
+          <test name="HistoryTestRelaxed"/>
+          <toolset name="intel-linux-9.1"/>
+          <note author="Andreas Huber" refid="29"/>
         </mark-expected-failures>
         <mark-expected-failures>
             <test name="StopWatch*"/>
@@ -4415,13 +4427,10 @@ for more information.
                 ignored.
             </note>
         </mark-expected-failures>
-        <mark-expected-failures>
+        <mark-expected-failures reason="?">
             <test name="DllTest*"/>
             <toolset name="msvc-8.0~wm5~stlport5.1"/>
-            <note author="Andreas Huber">
-                This test fails due to unresolved externals that are
-                not library-related.
-            </note>
+            <note author="Andreas Huber" refid="29"/>
         </mark-expected-failures>
     </library>
 

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit 415f7e1922e02bd53b39028bd943396f1be8377a
+Subproject commit c5ca6c051fc5768731d9bf48738c040a2f778aa6

粤ICP备19079148号