Get check for prog_openssl right in smoketest.

svn path=/rpkid/tests/smoketest.py; revision=3583

1 files changed, 6 insertions, 3 deletions

diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py
index 5d6b56d9..3b4fe7bc 100644
--- a/rpkid/tests/smoketest.py
+++ b/rpkid/tests/smoketest.py
@@ -141,10 +141,7 @@ prog_rootd     = cfg.get("prog_rootd",     "../../rootd.py")
 prog_pubd      = cfg.get("prog_pubd",      "../../pubd.py")
 prog_rsyncd    = cfg.get("prog_rsyncd",    "rsync")
 prog_rcynic    = cfg.get("prog_rcynic",    "../../../rcynic/rcynic")
-
 prog_openssl   = cfg.get("prog_openssl",   "../../../openssl/openssl/apps/openssl")
-if not os.path.exists(prog_openssl):
-  prog_openssl = "openssl"
 
 rcynic_stats   = cfg.get("rcynic_stats",   "echo ; ../../../rcynic/show.sh %s.xml ; echo" % rcynic_name)
 
@@ -186,6 +183,12 @@ def main():
     os.makedirs(smoketest_dir)
     os.chdir(smoketest_dir)
 
+  # Now that we're in the right directory, we can figure out whether
+  # we have a private openssl executable to use
+  global prog_openssl
+  if not os.path.exists(prog_openssl):
+    prog_openssl = "openssl"
+
   # Discard everything but keys, which take a while to generate
   for root, dirs, files in os.walk(".", topdown = False):
     for file in files: