diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-04-10 17:29:40 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-04-10 17:29:40 +0200 |
| commit | c4480f0a734a89af330bb1fa1e44627d57a98df4 (patch) | |
| tree | aa45bb3f9eae85c7e859cdee8ae24237e19d0579 | |
| parent | 8e5aa882378ca72f2e0b80c9800e09f4234c8a8e (diff) | |
Move path to verifycert.erl to config file.
| -rw-r--r-- | test/catlfish-test-local-merge.cfg | 1 | ||||
| -rwxr-xr-x | tools/merge.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg index 3de20ee..c4dffbb 100644 --- a/test/catlfish-test-local-merge.cfg +++ b/test/catlfish-test-local-merge.cfg @@ -6,3 +6,4 @@ paths: publickeys: tests/publickeys logpublickey: tests/keys/logkey.pem privatekeys: tests/privatekeys + verifycert_bin: ../verifycert.erl diff --git a/tools/merge.py b/tools/merge.py index c9d73fb..0435b77 100755 --- a/tools/merge.py +++ b/tools/merge.py @@ -251,7 +251,7 @@ for hash in new_entries: entries_to_fetch[storagenode["name"]].append(hash) break -verifycert = subprocess.Popen(["../verifycert.erl"], +verifycert = subprocess.Popen(paths["verifycert_bin"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) added_entries = 0 |