Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2C6831905F for ; Wed, 6 Apr 2016 09:52:17 +0000 (UTC) Received: (qmail 37941 invoked by uid 500); 6 Apr 2016 09:52:17 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 37900 invoked by uid 500); 6 Apr 2016 09:52:17 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 37890 invoked by uid 99); 6 Apr 2016 09:52:17 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2016 09:52:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 7A35D180315 for ; Wed, 6 Apr 2016 09:52:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id wHKUcbAqFjO7 for ; Wed, 6 Apr 2016 09:52:14 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id F3A3F5F253 for ; Wed, 6 Apr 2016 09:52:13 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id B585EE0282 for ; Wed, 6 Apr 2016 09:52:12 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 859A63A0331 for ; Wed, 6 Apr 2016 09:52:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1737956 - in /subversion/trunk/subversion/tests: cmdline/externals_tests.py libsvn_wc/op-depth-test.c Date: Wed, 06 Apr 2016 09:52:12 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160406095212.859A63A0331@svn01-us-west.apache.org> Author: rhuijben Date: Wed Apr 6 09:52:12 2016 New Revision: 1737956 URL: http://svn.apache.org/viewvc?rev=1737956&view=rev Log: Mark 2 tests that depend on directory moves containing file externals as XFail to fix the build until a proper solution is found. * subversion/tests/cmdline/externals_tests.py (move_with_file_externals): Mark XFail. * subversion/tests/libsvn_wc/op-depth-test.c (test_list): Mark move_delete_file_externals XFail. Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1737956&r1=1737955&r2=1737956&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Wed Apr 6 09:52:12 2016 @@ -3076,6 +3076,7 @@ def list_include_externals(sbox): expected_stdout, [], 0, 'ls', '--include-externals', C_url) @Issue(4293) +@XFail() def move_with_file_externals(sbox): "move with file externals" Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1737956&r1=1737955&r2=1737956&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Apr 6 09:52:12 2016 @@ -12032,7 +12032,7 @@ static struct svn_test_descriptor_t test "move depth expansion"), SVN_TEST_OPTS_XFAIL(move_retract, "move retract (issue 4336)"), - SVN_TEST_OPTS_PASS(move_delete_file_externals, + SVN_TEST_OPTS_XFAIL(move_delete_file_externals, "move/delete file externals (issue 4293)"), SVN_TEST_OPTS_PASS(update_with_tree_conflict, "update with tree conflict (issue 4347)"),