summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge-2.cfg
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2016-08-25 16:50:39 +0200
committerMagnus Ahltorp <map@kth.se>2016-10-05 10:08:43 +0200
commit49b40a0170b80b204746ab3bc42a73c5c60bcf0c (patch)
treecfb4b4e1a49b0cb05072e88829dfd801f293b745 /test/catlfish-test-local-merge-2.cfg
parent3be07b6f8ad46cf7ad4aff31e097a416f61ad50d (diff)
Move tests to test/Makefile
Tests only touch the catlfish/tests directory.
Diffstat (limited to 'test/catlfish-test-local-merge-2.cfg')
-rw-r--r--test/catlfish-test-local-merge-2.cfg16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/catlfish-test-local-merge-2.cfg b/test/catlfish-test-local-merge-2.cfg
index 7096619..579e360 100644
--- a/test/catlfish-test-local-merge-2.cfg
+++ b/test/catlfish-test-local-merge-2.cfg
@@ -10,11 +10,11 @@ nodename: merge-2
paths:
configdir: .
- knownroots: tests/known_roots
- mergedb: tests/mergedb-secondary
- https_certfile: tests/httpscert/httpscert-1.pem
- https_keyfile: tests/httpscert/httpskey-1.pem
- https_cacertfile: tests/httpsca/demoCA/cacert.pem
- publickeys: tests/publickeys
- logpublickey: tests/keys/logkey.pem
- privatekeys: tests/privatekeys
+ knownroots: known_roots
+ mergedb: mergedb-secondary
+ https_certfile: httpscert/httpscert-1.pem
+ https_keyfile: httpscert/httpskey-1.pem
+ https_cacertfile: httpsca/demoCA/cacert.pem
+ publickeys: publickeys
+ logpublickey: keys/logkey.pem
+ privatekeys: privatekeys