summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/catlfish-test-local-merge.cfg1
-rwxr-xr-xtools/merge.py2
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