From commits-return-6223-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Thu Apr 21 00:30:28 2011 Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85B361270 for ; Thu, 21 Apr 2011 00:30:28 +0000 (UTC) Received: (qmail 56391 invoked by uid 500); 21 Apr 2011 00:30:28 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 56346 invoked by uid 500); 21 Apr 2011 00:30:28 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 56339 invoked by uid 99); 21 Apr 2011 00:30:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2011 00:30:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2011 00:30:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0C60B23889B1; Thu, 21 Apr 2011 00:30:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1095576 - /couchdb/branches/1.1.x/test/etap/test_util.erl.in Date: Thu, 21 Apr 2011 00:30:05 -0000 To: commits@couchdb.apache.org From: davisp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110421003005.0C60B23889B1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davisp Date: Thu Apr 21 00:30:04 2011 New Revision: 1095576 URL: http://svn.apache.org/viewvc?rev=1095576&view=rev Log: Fix config file paths for etap tests. Partial backport of 1066932 from trunk. Modified: couchdb/branches/1.1.x/test/etap/test_util.erl.in Modified: couchdb/branches/1.1.x/test/etap/test_util.erl.in URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/test_util.erl.in?rev=1095576&r1=1095575&r2=1095576&view=diff ============================================================================== --- couchdb/branches/1.1.x/test/etap/test_util.erl.in (original) +++ couchdb/branches/1.1.x/test/etap/test_util.erl.in Thu Apr 21 00:30:04 2011 @@ -34,8 +34,9 @@ build_file(Name) -> filename:join([builddir(), Name]). config_files() -> - lists:map(fun build_file/1, [ - "etc/couchdb/default_dev.ini", - "etc/couchdb/local_dev.ini", - "test/etap/random_port.ini" - ]). + [ + build_file("etc/couchdb/default_dev.ini"), + build_file("etc/couchdb/local_dev.ini"), + source_file("test/etap/random_port.ini") + ]. +