summaryrefslogtreecommitdiff
path: root/test/etap
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2011-04-21 01:03:48 +0000
committerPaul Joseph Davis <davisp@apache.org>2011-04-21 01:03:48 +0000
commit6f922dd546b5302db50a14e54357fefa73a1b697 (patch)
treef48ba82eede4bc779fbdcf4790d56de8773a7f84 /test/etap
parentd0a0ac2a37d576bbab7aaa92aa05d07e52860d61 (diff)
Make local_dev.ini the last file in the config chain.
Backport of 1095581 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1095582 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/etap')
-rw-r--r--test/etap/test_util.erl.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
index 460b0293..b0c97a14 100644
--- a/test/etap/test_util.erl.in
+++ b/test/etap/test_util.erl.in
@@ -36,7 +36,7 @@ build_file(Name) ->
config_files() ->
[
build_file("etc/couchdb/default_dev.ini"),
- build_file("etc/couchdb/local_dev.ini"),
- source_file("test/etap/random_port.ini")
+ source_file("test/etap/random_port.ini"),
+ build_file("etc/couchdb/local_dev.ini")
].