From commits-return-107050-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Mon Mar 11 18:03:40 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C2C10180657 for ; Mon, 11 Mar 2019 19:03:39 +0100 (CET) Received: (qmail 3861 invoked by uid 500); 11 Mar 2019 18:03:38 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 3852 invoked by uid 99); 11 Mar 2019 18:03:38 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2019 18:03:38 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 5661A879BE; Mon, 11 Mar 2019 18:03:38 +0000 (UTC) Date: Mon, 11 Mar 2019 18:03:38 +0000 To: "commits@lucene.apache.org" Subject: [lucene-solr] branch master updated: SOLR-13268: Clean up any test failures resulting from defaulting to async logging. Fix precommit test to not include the baseDir MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155232741824.3776.10461799621226047041@gitbox.apache.org> From: erick@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: lucene-solr X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7eb728a611a5cad82e44bd662294d682353a2ccb X-Git-Newrev: 3a1603dab349fa828217fe1146e73c6a5f1a4fcf X-Git-Rev: 3a1603dab349fa828217fe1146e73c6a5f1a4fcf X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. erick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucene-solr.git The following commit(s) were added to refs/heads/master by this push: new 3a1603d SOLR-13268: Clean up any test failures resulting from defaulting to async logging. Fix precommit test to not include the baseDir 3a1603d is described below commit 3a1603dab349fa828217fe1146e73c6a5f1a4fcf Author: Erick Erickson AuthorDate: Mon Mar 11 11:03:31 2019 -0700 SOLR-13268: Clean up any test failures resulting from defaulting to async logging. Fix precommit test to not include the baseDir --- lucene/tools/src/groovy/check-source-patterns.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lucene/tools/src/groovy/check-source-patterns.groovy b/lucene/tools/src/groovy/check-source-patterns.groovy index e2dfb30..f0007ea 100644 --- a/lucene/tools/src/groovy/check-source-patterns.groovy +++ b/lucene/tools/src/groovy/check-source-patterns.groovy @@ -181,7 +181,8 @@ ant.fileScanner{ if (f.name.contains("Test")) { checkMockitoAssume(f, text); } - if (f.path.contains("solr/") && f.name.equals("SolrTestCase.java") == false) { + + if (f.path.substring(baseDirLen).contains("solr/") && f.name.equals("SolrTestCase.java") == false) { if (extendsLuceneTestCasePattern.matcher(text).find()) { reportViolation(f, "Solr test cases should extend SolrTestCase rather than LuceneTestCase"); }