[ovs-dev] [PATCH v2 02/14] tests: Replace ON_EXIT m4 macro by on_exit() shell function.

Joe Stringer joestringer at nicira.com
Wed Sep 9 22:36:56 UTC 2015


On 2 September 2015 at 16:43, Ben Pfaff <blp at nicira.com> wrote:
>  dnl set up sFlow logging
> -dnl ON_EXIT([kill `cat test-sflow.pid`])
>  AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
>  AT_CAPTURE_FILE([sflow.log])
>  SFLOW_PORT=`parse_listening_port < test-sflow.log`
> @@ -5192,7 +5191,6 @@ AT_XFAIL_IF([test "$IS_WIN32" = "yes"])
>  OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 options:ifindex=1010])
>
>  dnl set up sFlow logging
> -dnl ON_EXIT([kill `cat test-sflow.pid`])
>  AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
>  AT_CAPTURE_FILE([sflow.log])
>  SFLOW_PORT=`parse_listening_port < test-sflow.log`
> @@ -5297,7 +5295,6 @@ table=0 dl_src=50:54:00:00:00:0b actions=pop_mpls:0x0800,2
>  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
>
>  dnl set up sFlow logging
> -dnl ON_EXIT([kill `cat test-sflow.pid`])
>  AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore])
>  AT_CAPTURE_FILE([sflow.log])
>  SFLOW_PORT=`parse_listening_port < test-sflow.log`
> @@ -5391,7 +5388,7 @@ m4_define([CHECK_NETFLOW_EXPIRATION],
>    ADD_OF_PORTS([br0], 1, 2)

Were these instances deliberately removing the ON_EXIT(...) call, or
were they intended to be replaced with on_exit '...'?



More information about the dev mailing list