diff options
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/tests/smoketest.py | 5 | ||||
| -rw-r--r-- | rpkid/tests/yamltest.py | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index b298142e..5d6b56d9 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -139,10 +139,13 @@ prog_irdbd = cfg.get("prog_irdbd", "../../irdbd.py") prog_poke = cfg.get("prog_poke", "../../testpoke.py") prog_rootd = cfg.get("prog_rootd", "../../rootd.py") prog_pubd = cfg.get("prog_pubd", "../../pubd.py") -prog_openssl = cfg.get("prog_openssl", "../../../openssl/openssl/apps/openssl") 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) rpki_sql_file = cfg.get("rpki_sql_file", "../rpkid.sql") diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index 0eb69834..8e140746 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -72,7 +72,10 @@ prog_rpkid = cleanpath(rpkid_dir, "rpkid.py") prog_irdbd = cleanpath(rpkid_dir, "irdbd.py") prog_pubd = cleanpath(rpkid_dir, "pubd.py") prog_rootd = cleanpath(rpkid_dir, "rootd.py") + prog_openssl = cleanpath(this_dir, "../../openssl/openssl/apps/openssl") +if not os.path.exists(prog_openssl): + prog_openssl = "openssl" class roa_request(object): """ |