diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2015-11-05 15:07:57 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2015-11-09 15:18:36 +0100 |
| commit | 12f08e07e1d033d08d5094166475e47555b506ca (patch) | |
| tree | 67aea350fad87821b8f44cfe9e343e2014b2d63a | |
| parent | bde9fb6fa17e57215c66e362f3a48d85a7d858be (diff) | |
| download | strongswan-12f08e07e1d033d08d5094166475e47555b506ca.tar.bz2 strongswan-12f08e07e1d033d08d5094166475e47555b506ca.tar.xz | |
testing: Simplify fetching of swanctl --list-* output
| -rwxr-xr-x | testing/do-tests | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/testing/do-tests b/testing/do-tests index c01152c7b..46c59f778 100755 --- a/testing/do-tests +++ b/testing/do-tests @@ -504,32 +504,20 @@ do scp $SSHCONF $HOSTLOGIN:/etc/strongswan.conf \ $TESTRESULTDIR/${host}.strongswan.conf > /dev/null 2>&1 - if [ -n "$SWANCTL" ] then scp $SSHCONF $HOSTLOGIN:/etc/swanctl/swanctl.conf \ $TESTRESULTDIR/${host}.swanctl.conf > /dev/null 2>&1 - ssh $SSHCONF $HOSTLOGIN swanctl --list-conns \ - > $TESTRESULTDIR/${host}.swanctl.conns 2>/dev/null - - ssh $SSHCONF $HOSTLOGIN swanctl --list-certs \ - > $TESTRESULTDIR/${host}.swanctl.certs 2>/dev/null - - ssh $SSHCONF $HOSTLOGIN swanctl --list-pools \ - > $TESTRESULTDIR/${host}.swanctl.pools 2>/dev/null - - ssh $SSHCONF $HOSTLOGIN swanctl --list-authorities \ - > $TESTRESULTDIR/${host}.swanctl.authorities 2>/dev/null - - ssh $SSHCONF $HOSTLOGIN swanctl --list-sas \ - > $TESTRESULTDIR/${host}.swanctl.sas 2>/dev/null - - ssh $SSHCONF $HOSTLOGIN swanctl --list-pols \ - > $TESTRESULTDIR/${host}.swanctl.pols 2>/dev/null + for subsys in conns certs pools authorities sas pols + do + ssh $SSHCONF $HOSTLOGIN swanctl --list-$subsys \ + > $TESTRESULTDIR/${host}.swanctl.$subsys 2>/dev/null + done - ssh $SSHCONF $HOSTLOGIN swanctl --stats \ - > $TESTRESULTDIR/${host}.swanctl.stats 2>/dev/null + # this is quite slow due to allocation stats via leak-detective + ssh $SSHCONF $HOSTLOGIN swanctl --stats \ + > $TESTRESULTDIR/${host}.swanctl.stats 2>/dev/null else for file in ipsec.conf ipsec.secrets do |