diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-10 19:44:34 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-10 19:44:34 +0000 |
| commit | b7459d825cfadb9db265ed1b3bd0c10682464767 (patch) | |
| tree | 6e415c4dd6b78e84a58ae0038ab9847fb69feafc /ca/tests | |
| parent | d55fa906e96023892bc15a3f1eb5d0555cfdf64e (diff) | |
Remove ancient kludge for running rtr-origin from source tree;
instead, test scripts must override on command line. Syntax is even
more wretched than before, but at least semantics are now right;
syntax will be fixed when rtr-origin gets rewritten to use argparse
subparsers.
svn path=/branches/tk685/; revision=5782
Diffstat (limited to 'ca/tests')
| -rw-r--r-- | ca/tests/smoketest.1.yaml | 8 | ||||
| -rw-r--r-- | ca/tests/smoketest.3.yaml | 4 | ||||
| -rw-r--r-- | ca/tests/smoketest.7.yaml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ca/tests/smoketest.1.yaml b/ca/tests/smoketest.1.yaml index 81bc887a..0e9acb85 100644 --- a/ca/tests/smoketest.1.yaml +++ b/ca/tests/smoketest.1.yaml @@ -52,8 +52,8 @@ kids: --- - shell set -x; - rtr_origin='python ../../../rp/rpki-rtr/rtr-origin.py'; - $rtr_origin --cronjob rcynic-data/authenticated && + rtr_origin='../../../rp/rpki-rtr/rtr-origin'; + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show --- - name: R0 @@ -70,8 +70,8 @@ kids: ipv4: 10.3.0.1/32, 10.0.0.44/32 --- - shell set -x; - rtr_origin='python ../../../rp/rpki-rtr/rtr-origin.py'; - $rtr_origin --cronjob rcynic-data/authenticated && + rtr_origin='../../../rp/rpki-rtr/rtr-origin'; + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show --- - sleep 30 diff --git a/ca/tests/smoketest.3.yaml b/ca/tests/smoketest.3.yaml index 41a88643..df308ebe 100644 --- a/ca/tests/smoketest.3.yaml +++ b/ca/tests/smoketest.3.yaml @@ -62,7 +62,7 @@ kids: #--- - shell set -x; rtr_origin=../../../rp/rpki-rtr/rtr-origin; - $rtr_origin --cronjob rcynic-data/authenticated && + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show --- - name: Alice @@ -77,5 +77,5 @@ kids: --- - shell set -x; rtr_origin=../../../rp/rpki-rtr/rtr-origin; - $rtr_origin --cronjob rcynic-data/authenticated && + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show diff --git a/ca/tests/smoketest.7.yaml b/ca/tests/smoketest.7.yaml index 7c808552..2da48770 100644 --- a/ca/tests/smoketest.7.yaml +++ b/ca/tests/smoketest.7.yaml @@ -73,5 +73,5 @@ roa_request: -print -exec ../../../rp/utils/print_roa {} \; ; rtr_origin=../../../rp/rpki-rtr/rtr-origin; - $rtr_origin --cronjob rcynic-data/authenticated && + $rtr_origin --scan-roas ../../../rp/utils/scan_roas --scan-routercerts ../../../rp/utils/scan_routercerts --cronjob rcynic-data/authenticated && $rtr_origin --show |