diff options
author | Magnus Ahltorp <map@kth.se> | 2016-08-25 16:50:39 +0200 |
---|---|---|
committer | Magnus Ahltorp <map@kth.se> | 2016-08-25 16:50:39 +0200 |
commit | de5a2c656e7b75b44a39e2f3865c078a4937c338 (patch) | |
tree | 83dbaa8bb08e32321735258c634fe40d1ee74e73 /test/catlfish-test-local-merge-2.cfg | |
parent | 94ee306080c2e386ec357e6815dc84a44936a84a (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.cfg | 16 |
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 |