From c4480f0a734a89af330bb1fa1e44627d57a98df4 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 10 Apr 2015 17:29:40 +0200
Subject: Move path to verifycert.erl to config file.

---
 test/catlfish-test-local-merge.cfg | 1 +
 tools/merge.py                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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
-- 
cgit v1.1