Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1172082 - in /incubator/ooo/trunk/main:
 ucb/qa/unoapi/knownissues.xcl ucb/qa/unoapi/ucb.sce
 xmlsecurity/qa/certext/makefile.mk
Date: Sat, 17 Sep 2011 22:32:27 -0000
To: ooo-commits@incubator.apache.org
From: mst@apache.org
Message-Id: <20110917223227.2F11A238888F@eris.apache.org>

Author: mst
Date: Sat Sep 17 22:32:26 2011
New Revision: 1172082

URL: http://svn.apache.org/viewvc?rev=1172082&view=rev
Log:
ucb, xmlsecurity: disable tests that fail because of ASF licensing compliance

ucb: WebDAV UCP is not available by default because it depends on neon.
     unfortunately it doesn't seem possible to check a variable in sce/xcl
     files so disable tests always.
xmlsecurity: test disabled if NSS is not available (default case)

Modified:
    incubator/ooo/trunk/main/ucb/qa/unoapi/knownissues.xcl
    incubator/ooo/trunk/main/ucb/qa/unoapi/ucb.sce
    incubator/ooo/trunk/main/xmlsecurity/qa/certext/makefile.mk

Modified: incubator/ooo/trunk/main/ucb/qa/unoapi/knownissues.xcl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/qa/unoapi/knownissues.xcl?rev=1172082&r1=1172081&r2=1172082&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/qa/unoapi/knownissues.xcl (original)
+++ incubator/ooo/trunk/main/ucb/qa/unoapi/knownissues.xcl Sat Sep 17 22:32:26 2011
@@ -1,2 +1,5 @@
 ### i86626 ###
 ucb.UniversalContentBroker::com::sun::star::ucb::XCommandProcessor
+
+### webdav: neon disabled by default ###
+ucb.UniversalContentBroker::com::sun::star::ucb::XContentProvider

Modified: incubator/ooo/trunk/main/ucb/qa/unoapi/ucb.sce
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/qa/unoapi/ucb.sce?rev=1172082&r1=1172081&r2=1172082&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/qa/unoapi/ucb.sce (original)
+++ incubator/ooo/trunk/main/ucb/qa/unoapi/ucb.sce Sat Sep 17 22:32:26 2011
@@ -3,7 +3,7 @@
 -o ucb.UcbStore
 -o ucb.UniversalContentBroker
 -o ucpchelp.CHelpContentProvider
--o ucpdav.WebDAVContentProvider
+#webdav: neon disabled by default# -o ucpdav.WebDAVContentProvider
 -o ucpfile.FileProvider
 -o ucpftp.FTPContentProvider
 -o ucphier.HierarchyContentProvider

Modified: incubator/ooo/trunk/main/xmlsecurity/qa/certext/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmlsecurity/qa/certext/makefile.mk?rev=1172082&r1=1172081&r2=1172082&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmlsecurity/qa/certext/makefile.mk (original)
+++ incubator/ooo/trunk/main/xmlsecurity/qa/certext/makefile.mk Sat Sep 17 22:32:26 2011
@@ -24,6 +24,9 @@
 # for a copy of the LGPLv3 License.
 #
 #***********************************************************************/
+.IF "$(ENABLE_NSS_MODULE)" == "NO"
+nothing .PHONY:
+.ELSE
 .IF "$(OOO_SUBSEQUENT_TESTS)" == ""
 nothing .PHONY:
 .ELSE 
@@ -68,4 +71,5 @@ cpptest : $(SHL1TARGETN)
 
 CPPTEST_LIBRARY = $(SHL1TARGETN)
 
-.END
\ No newline at end of file
+.END
+.END