diff options
| author | Robert Newson <robert.newson@cloudant.com> | 2011-06-13 14:59:55 +0100 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2011-06-13 14:59:55 +0100 |
| commit | e9a5a6f90a021db1db8a7e55ec797a4c86edcad6 (patch) | |
| tree | 06d0c28969cfcf54b2f137e7407b097f73aa0f21 /apps/couch/src/test_util.erl | |
| parent | 266ba88ac6ded40087e0211ad9e75e4ce64e66cb (diff) | |
| parent | 3c1a0d7e2c9adef4f8b20c9df205a86e5c0feefb (diff) | |
Merge CouchDB 1.1
Diffstat (limited to 'apps/couch/src/test_util.erl')
| -rw-r--r-- | apps/couch/src/test_util.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/couch/src/test_util.erl b/apps/couch/src/test_util.erl index e43338e7..55b95139 100644 --- a/apps/couch/src/test_util.erl +++ b/apps/couch/src/test_util.erl @@ -13,7 +13,7 @@ -module(test_util). -export([init_code_path/0]). --export([source_file/1, build_file/1]). +-export([source_file/1, build_file/1, config_files/0]). init_code_path() -> code:load_abs("apps/couch/test/etap/etap"). @@ -22,4 +22,12 @@ source_file(Name) -> filename:join(["apps/couch", Name]). build_file(Name) -> - filename:join(["apps/couch", Name]). + filename:join(["rel/overlay", Name]). + +config_files() -> + [ + build_file("etc/default.ini"), + build_file("etc/local.ini"), + source_file("test/etap/random_port.ini") + ]. + |