[Libreoffice-commits] .: 2 commits - sal/osl smoketestoo_native/data

[Stephan Bergmann]

 sal/osl/unx/socket.c               |    2 --
 smoketestoo_native/data/Global.xml |   10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 79dd329a884c2746b41c9c32116895a7237d286e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 15 20:49:51 2011 +0200

    Removed bogus assert.

diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 2db6301..39a733a 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -1246,8 +1246,6 @@ void SAL_CALL osl_getHostnameOfHostAddr (
 
 const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr)
 {
-    OSL_ASSERT(pAddr);
-
     if (pAddr)
         return pAddr->pHostName;
     else
commit ee02d6eb263b7683ae9d0dc61c334bad6545af9c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 15 20:40:48 2011 +0200

    Added more detailed information to smoketest failure result string.

diff --git a/smoketestoo_native/data/Global.xml b/smoketestoo_native/data/Global.xml
index 6f9c066..e956f45 100644
--- a/smoketestoo_native/data/Global.xml
+++ b/smoketestoo_native/data/Global.xml
@@ -448,7 +448,11 @@ Function RecordTestCaseStatus( nAction as Integer, bState as Boolean, sFailureAn
     gErrorState (nStatusType, nAction) = nState
 
     If ( nState = cLogFalse ) And ( sFailureAnnotation &lt;&gt; &quot;&quot; ) Then
-        gTestCaseAnnotations( nStatusType, nAction ) = gTestCaseAnnotations( nStatusType, nAction ) + sFailureAnnotation + chr(13)
+        if gTestCaseAnnotations(nStatusType, nAction) &lt;&gt; &quot;&quot; then
+            gTestCaseAnnotations(nStatusType, nAction) = _
+                gTestCaseAnnotations(nStatusType, nAction) &amp; &quot;; &quot;
+        end if
+        gTestCaseAnnotations( nStatusType, nAction ) = gTestCaseAnnotations( nStatusType, nAction ) + sFailureAnnotation
     End If
 
     RecordTestCaseStatus = bState
@@ -721,6 +725,10 @@ Function StartTestWithDefaultOptions
                     result = result &amp; action(j)
                 end if
                 end if
+                if gTestCaseAnnotations(i, j) &lt;&gt; &quot;&quot; then
+                    result = result &amp; &quot;(&quot; &amp; _
+                        gTestCaseAnnotations(i, j) &amp; &quot;)&quot;
+                end if
             end if
         next j
     next i