From commits-return-6250-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Thu Apr 21 23:04:51 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 2DA0C24D0 for ; Thu, 21 Apr 2011 23:04:51 +0000 (UTC) Received: (qmail 45724 invoked by uid 500); 21 Apr 2011 23:04:51 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 45654 invoked by uid 500); 21 Apr 2011 23:04:51 -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 45647 invoked by uid 99); 21 Apr 2011 23:04:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Apr 2011 23:04:51 +0000 X-ASF-Spam-Status: No, hits=-1996.4 required=5.0 tests=ALL_TRUSTED,FS_REPLICA 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 23:04:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFC8023889BB; Thu, 21 Apr 2011 23:04:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1095842 - in /couchdb/branches/1.1.x/test/etap: 081-config-override.t 112-replication-missing-revs.t Date: Thu, 21 Apr 2011 23:04:29 -0000 To: commits@couchdb.apache.org From: davisp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110421230429.AFC8023889BB@eris.apache.org> Author: davisp Date: Thu Apr 21 23:04:29 2011 New Revision: 1095842 URL: http://svn.apache.org/viewvc?rev=1095842&view=rev Log: More fixes for the build system. Modified: couchdb/branches/1.1.x/test/etap/081-config-override.t couchdb/branches/1.1.x/test/etap/112-replication-missing-revs.t Modified: couchdb/branches/1.1.x/test/etap/081-config-override.t URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/081-config-override.t?rev=1095842&r1=1095841&r2=1095842&view=diff ============================================================================== --- couchdb/branches/1.1.x/test/etap/081-config-override.t (original) +++ couchdb/branches/1.1.x/test/etap/081-config-override.t Thu Apr 21 23:04:29 2011 @@ -148,7 +148,7 @@ test() -> ), etap:is( - couch_config:set("httpd", "port", "8080", false), + couch_config:set("httpd", "port", "8080"), ok, "Writing {httpd, port} is kosher." ), Modified: couchdb/branches/1.1.x/test/etap/112-replication-missing-revs.t URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/test/etap/112-replication-missing-revs.t?rev=1095842&r1=1095841&r2=1095842&view=diff ============================================================================== --- couchdb/branches/1.1.x/test/etap/112-replication-missing-revs.t (original) +++ couchdb/branches/1.1.x/test/etap/112-replication-missing-revs.t Thu Apr 21 23:04:29 2011 @@ -39,13 +39,6 @@ conn = nil }). -config_files() -> - lists:map(fun test_util:build_file/1, [ - "etc/couchdb/default_dev.ini", - "etc/couchdb/local_dev.ini", - "test/etap/random_port.ini" - ]). - main(_) -> test_util:init_code_path(), @@ -60,7 +53,7 @@ main(_) -> ok. test() -> - couch_server_sup:start_link(config_files()), + couch_server_sup:start_link(test_util:config_files()), ibrowse:start(), crypto:start(),