testing: replace 'ipsec look' with .../ipsec-look.sh

The latter, in addition to invoking 'ipsec look', dumps raw 'ip ...' output (wrapped in cut/tuc) to stdout. Capturing the raw output in *.console.verbose.txt makes debugging 'ipsec look's managed output possible.
libreswan · Jun 10, 2018 · 11b2921 · 11b2921
1 parent bf1b1af
commit 11b2921
Show file tree

Hide file tree

Showing 1,370 changed files with 1,484 additions and 1,473 deletions.
diff --git a/programs/look/look.in b/programs/look/look.in
@@ -3,6 +3,7 @@
 # Copyright (C) 1998, 1999  Henry Spencer.
 # Copyright (C) 2012  Paul Wouters
 # Copyright (C) 2015 Tuomo Soini <tis@foobar.fi>
+# Copyright (C) 2018  Andrew Cagney
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the

diff --git a/testing/pluto/aggr-pluto-01/east.console.txt b/testing/pluto/aggr-pluto-01/east.console.txt
@@ -30,7 +30,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/aggr-pluto-01/final.sh b/testing/pluto/aggr-pluto-01/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/aggr-pluto-01/west.console.txt b/testing/pluto/aggr-pluto-01/west.console.txt
@@ -79,7 +79,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/aggr-pluto-02/east.console.txt b/testing/pluto/aggr-pluto-02/east.console.txt
@@ -30,7 +30,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/aggr-pluto-02/final.sh b/testing/pluto/aggr-pluto-02/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/aggr-pluto-02/west.console.txt b/testing/pluto/aggr-pluto-02/west.console.txt
@@ -79,7 +79,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/aggr-pluto-04/east.console.txt b/testing/pluto/aggr-pluto-04/east.console.txt
@@ -30,7 +30,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/aggr-pluto-04/final.sh b/testing/pluto/aggr-pluto-04/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/aggr-pluto-04/west.console.txt b/testing/pluto/aggr-pluto-04/west.console.txt
@@ -83,7 +83,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-01/east.console.txt b/testing/pluto/ah-pluto-01/east.console.txt
@@ -11,7 +11,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-01/final.sh b/testing/pluto/ah-pluto-01/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-01/west.console.txt b/testing/pluto/ah-pluto-01/west.console.txt
@@ -61,7 +61,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-02/east.console.txt b/testing/pluto/ah-pluto-02/east.console.txt
@@ -11,7 +11,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-02/final.sh b/testing/pluto/ah-pluto-02/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-02/west.console.txt b/testing/pluto/ah-pluto-02/west.console.txt
@@ -58,7 +58,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-03/east.console.txt b/testing/pluto/ah-pluto-03/east.console.txt
@@ -11,7 +11,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-03/final.sh b/testing/pluto/ah-pluto-03/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-03/west.console.txt b/testing/pluto/ah-pluto-03/west.console.txt
@@ -58,7 +58,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-04/east.console.txt b/testing/pluto/ah-pluto-04/east.console.txt
@@ -11,7 +11,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-04/final.sh b/testing/pluto/ah-pluto-04/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-04/west.console.txt b/testing/pluto/ah-pluto-04/west.console.txt
@@ -58,7 +58,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-05/east.console.txt b/testing/pluto/ah-pluto-05/east.console.txt
@@ -11,7 +11,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-05/final.sh b/testing/pluto/ah-pluto-05/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-05/west.console.txt b/testing/pluto/ah-pluto-05/west.console.txt
@@ -58,7 +58,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-07-klips-netkey/east.console.txt b/testing/pluto/ah-pluto-07-klips-netkey/east.console.txt
@@ -32,7 +32,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 192.0.2.0/24       -> 192.0.1.0/24       => tun0xIPIP@192.1.2.45 ah0xAHSPI@192.1.2.45
 192.0.2.111/32     -> 192.0.1.111/32     => tun0xIPIP@192.1.2.45 ah0xAHSPI@192.1.2.45

diff --git a/testing/pluto/ah-pluto-07-klips-netkey/final.sh b/testing/pluto/ah-pluto-07-klips-netkey/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-07-klips-netkey/west.console.txt b/testing/pluto/ah-pluto-07-klips-netkey/west.console.txt
@@ -81,7 +81,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-09/east.console.txt b/testing/pluto/ah-pluto-09/east.console.txt
@@ -3,7 +3,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 IPSEC mangle TABLES
 NEW_IPSEC_CONN mangle TABLES

diff --git a/testing/pluto/ah-pluto-09/final.sh b/testing/pluto/ah-pluto-09/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-09/west.console.txt b/testing/pluto/ah-pluto-09/west.console.txt
@@ -14,7 +14,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 XFRM policy:

diff --git a/testing/pluto/ah-pluto-12/east.console.txt b/testing/pluto/ah-pluto-12/east.console.txt
@@ -11,7 +11,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-12/final.sh b/testing/pluto/ah-pluto-12/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-12/west.console.txt b/testing/pluto/ah-pluto-12/west.console.txt
@@ -60,7 +60,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/ah-pluto-13/east.console.txt b/testing/pluto/ah-pluto-13/east.console.txt
@@ -31,7 +31,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/ah-pluto-13/final.sh b/testing/pluto/ah-pluto-13/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/ah-pluto-13/west.console.txt b/testing/pluto/ah-pluto-13/west.console.txt
@@ -80,7 +80,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/algo-pluto-01/east.console.txt b/testing/pluto/algo-pluto-01/east.console.txt
@@ -31,7 +31,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/algo-pluto-01/final.sh b/testing/pluto/algo-pluto-01/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/algo-pluto-01/west.console.txt b/testing/pluto/algo-pluto-01/west.console.txt
@@ -81,7 +81,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/algo-pluto-04/final.sh b/testing/pluto/algo-pluto-04/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/algo-pluto-04/westrun.sh b/testing/pluto/algo-pluto-04/westrun.sh
@@ -1,6 +1,6 @@
 ipsec auto --up  westnet-eastnet-esp-sha1-pfs
-ipsec look
+../../pluto/bin/ipsec-look.sh
 ipsec auto --delete  westnet-eastnet-esp-sha1-pfs
 ipsec auto --up  westnet-eastnet-esp-md5-pfs
-ipsec look
+../../pluto/bin/ipsec-look.sh
 echo done
diff --git a/testing/pluto/algo-pluto-08/east.console.txt b/testing/pluto/algo-pluto-08/east.console.txt
@@ -31,7 +31,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/algo-pluto-08/final.sh b/testing/pluto/algo-pluto-08/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/algo-pluto-08/west.console.txt b/testing/pluto/algo-pluto-08/west.console.txt
@@ -81,7 +81,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/algo-pluto-09/east.console.txt b/testing/pluto/algo-pluto-09/east.console.txt
@@ -31,7 +31,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/algo-pluto-09/final.sh b/testing/pluto/algo-pluto-09/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====

diff --git a/testing/pluto/algo-pluto-09/west.console.txt b/testing/pluto/algo-pluto-09/west.console.txt
@@ -79,7 +79,7 @@ west #
  echo done
 done
 west #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 west NOW
 XFRM state:
 src 192.1.2.23 dst 192.1.2.45

diff --git a/testing/pluto/algo-pluto-10/east.console.txt b/testing/pluto/algo-pluto-10/east.console.txt
@@ -30,7 +30,7 @@ east #
  echo "initdone"
 initdone
 east #
- ipsec look
+ ../../pluto/bin/ipsec-look.sh
 east NOW
 XFRM state:
 src 192.1.2.45 dst 192.1.2.23

diff --git a/testing/pluto/algo-pluto-10/final.sh b/testing/pluto/algo-pluto-10/final.sh
@@ -1,4 +1,4 @@
-ipsec look
+../../pluto/bin/ipsec-look.sh
 : ==== cut ====
 ipsec auto --status
 : ==== tuc ====